Fix CE-EE LDAP merge conflicts

See merge request !210

Conflicts:
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb
	features/admin/groups.feature
	features/steps/admin/groups.rb

Fixes from master

It includes:

* https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1193
* https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1196
* https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1195

See merge request !1198

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

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

We need to skip empty repositories when creating a backup. Before this
change, we were asking gollum-lib if the wiki contains any _pages_. Now
we ask gitlab_git if the repository contains _files_. This should
resolve gollum_lib Grit timeouts in the backup script.

7-4-stable CE to EE

See merge request !207

Conflicts:
	VERSION
	doc/install/installation.md

Added EE changelog

See merge request !204

CE master to EE master

See merge request !203

Merge master into 7-4-stable

See merge request !1189

Fix user being blocked after oauth sign-in

See merge request !1190

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

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

Issue respect single sign on

Adds regression test for #1677

See merge request !1188

verification for #1677

Since testing omniauth_callback_controller.rb is very difficult, the logic
is moved to the models

This is handled within the LDAP class

CE upstream

See merge request !202

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

Feature migrate to multiple ldaps

Still needs some documentation.

Basic flow:
- Upgrade to the newest EE
- Change gitlab.yml to include the server hash
- Run `rake gitlab:migrate_ldap_providers`

This will ensure all current ldap groups links will continue working.

See merge request !200

Add a few items to changelog

See merge request !1187

Issue respect single sign on

Fixes #1677 by making sure the per-build user is saved as well. Otherwise the user is passed to devise, and the user is saved afterwards, creating a successful signup.

See merge request !1186

Because devise will trigger a save, allowing unsaved users to login, behaviour had changed.
The current implementation returns a pre-build user, which can be saved without errors.

Reported in #1677

Fix link to githost.io

Documentation pointed to wrong gitlab-ci project.

See merge request !222