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
fixed regex to match url pointing to a user repo
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
Use tags to do minor updates of GitLab
 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>
Default values for web hooks

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
fixed typo in user management help page
 Merge branch 'backup_version' into 'master'

Less strict backup versions
Merge pull request #6428 from tsl0922/remove-broken-diffs

remove dead code: broken_diffs
Merge pull request #6359 from jasonblanchard/comment-attachment-filename

Fixed attachment identifier displaying underneath note text
Merge branch 'master' of github.com:gitlabhq/gitlabhq