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

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

Fix spelling of "GitLab" in HipChat service

add rake gitlab:import: all_users_to_all_groups and user_to_groups

Pedantic, but it frustrates OCD people like myself :)

 Use rails scss image-url herlper

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

Just a minor spelling error.

Split the user ssh keys by newline, not the characters "\n"

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

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

Dont use gravatars for user select if gravatar is disabled

Fixes #836

before:
GET /user.keys

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

after:
GET /user.keys

ssh-rsa ...
ssh-rsa ...
sha-rsa ...

User pages are public

ssh keys publically available for sysadmins via http, the github way

... if the user is authorized to at least one public project.

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

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

Merge branch 'retrieve_ssh_keys_by_ssh' of github.com:devaroop/gitlabhq into retrieve_ssh_keys_by_ssh

Update upgrade guide if you have more than one backup .tar file

fix: link_to_merge_request_diff_line_note

Fix 500 error in Ruby 1.9.

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

Conflicts:
	doc/update/upgrader.md

We Hate Options

Fix numbering in 6.3-to-6.4.md

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

Feature: show last commit for Blob#show

Fixes #970

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

Update changelog for #6267

Fix wrong issues appears at Dashboard#issues page

Fixes #1028

Ace Editor as gem