Merge branch 'ace_editor' into 'master'

Ace Editor as gem
 Merge branch 'bug/filtering_service' into 'master'

Fix wrong issues appears at Dashboard#issues page

Fixes #1028
Merge pull request #6276 from robertd/update_changelog

Update changelog for #6267
Show last commit for Blob#show

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

Feature: show last commit for Blob#show

Fixes #970
Fix new password page UI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
We do not like configuration options.
Merge pull request #5975 from terrywang/fix-update-doc

Fix numbering in 6.3-to-6.4.md
 Merge branch 'we-hate-options' into 'master'

We Hate Options
Fix spelling of plural project (projects and not project's).
Require a full yes.
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Merge branch 'layout-of-upgrader'

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

Conflicts:
	doc/update/upgrader.md
Added margin between form and button in reset-password form.
Update api project documentation to include project name as attribute.
Merge pull request #6249 from babatakao/fix_500_in_ruby19

Fix 500 error in Ruby 1.9.
Merge pull request #6087 from pgolm/fix/link_to_merge_request_diff_line_note

fix: link_to_merge_request_diff_line_note
Merge pull request #6264 from robertd/update_upgrade_guide

Update upgrade guide if you have more than one backup .tar file
code refactor as per standards
Merge branch 'retrieve_ssh_keys_by_ssh' of github.com:devaroop/gitlabhq into retrieve_ssh_keys_by_ssh