Fixed attachment identifier displaying underneath note text
Added executable file permission to binstubs
Add reaping_frequency for MySQL production DB

This helped avoid ActiveRecord::ConnectionTimeoutError errors for
Sidekiq on GitLab Cloud.
Fixed typo in comments of apllication.scss
Support symlinked public/uploads for backp restore

The backup restore code moves any existing uploads directory out of the
way before restoring the copy from the backup. If public/uploads was a
symlink, this move would replace the symlink. This commit avoids this
issue by first resolving any symlinks in the uploads path.
Use gitlab_shell.path to invoke rewrite-hooks.sh

The backup restore code for repositories was assuming that gitlab-shell
is installed in /home/git/gitlab-shell. This commit changes that to use
the configuration setting from gitlab.yml that specifies the path where
gitlab-shell is installed.
Empty the database during Postgres backup restore

The expected behavior during a GitLab backup restore is to overwrite
existing database data. This works for MySQL because the output of
mysqldump contains 'DROP TABLE IF EXISTS' statements. pg_dump on the
other hand assumes that one will restore into an empty database. When
this is not the case, during the restore with psql some of the data will
be skipped if existing data is 'in the way'. By first invoking `rake
db:schema:load` during a Postgres GitLab backup restore, we make sure
that all important data is correctly restored.
Updated changelog with my name for #6267
Merge pull request #6423 from robertd/update_changelog

Updated changelog with my name for #6267
Merge pull request #6416 from robbytaylor/patch-1

Fixed typo in comments of apllication.scss
 Merge branch 'backup_restore_hooks_bug' into 'master'

Fix backup/restore git hooks bug
remove dead code: broken_diffs
Enable html_escape for code blocks highlighted in markdown

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
html_escape is private for rails 4.0.2 :(

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 Merge branch 'highlight_html_escape' into 'master'

Enable html_escape for code blocks highlighted in markdown

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/94
Merge branch 'master' of github.com:gitlabhq/gitlabhq
 Merge branch 'pg_force_restore' into 'master'

Pg Force Restore
Use Gitlab::VERSION to version backups

Previous to this commit, backups were tied to the git revision (SHA1) of
the app at the time the backup:create command was invoked. If the SHA1
at the time of restore was different, the script would refuse to restore
the backup.  This commit loosens this tie so that the backup script only
complains if the value of the Gitlab::VERSION constant is different
between the time of backup and the time of restore.
Use new gitlab_git gem. It makes CONTRIBUTING.md work

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Add default value for Project#imported boolean

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>