Read configuration variable file if it is present
Fix Markdown help page: escape file link syntax example to leave it unprocessed
Fixed comments for running gitlab in a non-root path
- If you don't edit gitlab-shell/config.yml, you wnon't be able to push via SSH (as described here: http://stackoverflow.com/questions/15746336/gitlab-cant-push-code-to-server)
- If you don't re-run sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production, some icons won't be visible
Better warning when deleting a user

Warn the administrator better when deleting a user.
Fixes: https://github.com/gitlabhq/gitlabhq/issues/4295
Git clone now gets the right branch from the getgo

Simplified the instructions by two steps.
Added Rake:Attack cp information to Upgrade Guide 6.3.0
The comments make it hard to copy paste commands. If you paste the whole line it fails.
Avoid duplicate group membership emails
Merge pull request #5471 from dex4er/feature_etc_default_gitlab

Read configuration variable file (/etc/default/gitlab) if it is present
Skip email confirmation with LDAP
Merge branch 'users_group_observer' of /home/git/repositories/gitlab/gitlabhq
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Added example defaults file and appropriate documentation.
Fixed security issue.
Merge branch 'master' of https://github.com/gitlabhq/gitlabhq

Conflicts:
	config/application.rb
	config/gitlab.yml.example
	config/unicorn.rb.example
Merge pull request #5483 from e1himself/patch-1

Fix Markdown help page: escape file link syntax example to leave it unprocessed
Merge pull request #5548 from CromFr/master

Fixed comments for running gitlab in a non-root path
Show GitLab API version on Admin#dashboard

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Remove duplicate items from search autocomplete

Old behaviour gave you duplicate entries if your project is public

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Set noreply@HOSTNAME for reply_to field in all emails

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