Headers have ids and link to their own id.
remove unwanted spaces, reduce diff, clean before merge
Merge pull request #5261 from devaroop/retrieve_ssh_keys_by_ssh

ssh keys publically available for sysadmins via http, the github way
Merge pull request #6177 from cirosantilli/public-user-pages

User pages are public
Split the user ssh keys by newline, not the characters "\n"

before:
GET /user.keys

ssh-rsa ...\nssh-rsa ...\nssh-rsa ...

after:
GET /user.keys

ssh-rsa ...
ssh-rsa ...
sha-rsa ...
 Merge branch 'bug/gravatr_select2' into 'master'

Dont use gravatars for user select if gravatar is disabled

Fixes #836
Merge branch 'header-anchors' of github.com:cirosantilli/gitlab-elearn into cirosantilli-header-anchors

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

Conflicts:
	CHANGELOG
Restore old padding for wiki blocks

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge pull request #6297 from jojosch/user-public-ssh-keys-newline

Split the user ssh keys by newline, not the characters "\n"
 Merge branch 'fix-projects-spelling' into 'master'

Fix spelling of plural project (projects and not project's).

Just a minor spelling error.
 Merge branch 'asset-path-in-scss' into 'master'

 Use rails scss image-url herlper
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Fix spelling of "GitLab" in HipChat service

Pedantic, but it frustrates OCD people like myself :)
Merge pull request #5520 from gabetax/rake_group_bulk_add_permissions

add rake gitlab:import: all_users_to_all_groups and user_to_groups
Merge pull request #6298 from ralish/hipchat-spelling-fix

Fix spelling of "GitLab" in HipChat service
Add information about rich text format dependencies.
Use gitlab_git 5.4.0 without BROKEN_DIFF constant

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Improve compare logic for EmailOnPush service

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fix link for MR diff download

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