Merge branch 'feature/api_cors' of /home/git/repositories/gitlab/gitlabhq
Better warning when deleting a user

Warn the administrator better when deleting a user.
Fixes: https://github.com/gitlabhq/gitlabhq/issues/4295
Merge branch 'update-patch-guide' of /home/git/repositories/gitlab/gitlabhq
Remove colors from icon helpers

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Show rails version in admin area

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Git clone now gets the right branch from the getgo

Simplified the instructions by two steps.
Mention enterprise edition and the book, also some cleanup.
Merge branch 'add-book' of /home/git/repositories/gitlab/gitlabhq
fix typo: enthousiast -> enthusiast
Merge pull request #5791 from mmoll/typo

fix typo: enthousiast -> enthusiast
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
Add import_url param in API projects create
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.