Conflicts:
	app/controllers/sessions_controller.rb
	app/models/user.rb
	app/views/devise/sessions/new.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb
	config/initializers/devise.rb
	lib/api/ldap.rb
	lib/gitlab/ldap/authentication.rb
	lib/gitlab/ldap/config.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/ldap/user.rb

Due to the complicated merge, part of the new functionalilty is inserted here

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

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb

Feature multiple ldap servers

Update the code so Gitlab-EE can support multiple LDAP servers

See merge request !1172

Libravatar documentation

Fixes #1248

See merge request !1173

Notification level note

Fixes #1406

![Screenshot 2014-10-14 12.28.40](https://dev.gitlab.org/uploads/gitlab/gitlabhq/e2aef0a8d6/Screenshot_2014-10-14_12.28.40.png)

See merge request !1174

And add some advertisement to use GitLab EE

Skip ad check

Fixes #181

See merge request !193

update changelog

Change log entry for https://github.com/gitlabhq/gitlabhq/pull/8020

Make new and edit file submit more uniform

Conflicts:
	app/controllers/omniauth_callbacks_controller.rb

Sorting users in admin

See merge request !1170