Conflicts:
	app/models/user.rb
	config/gitlab.yml.example
	spec/lib/gitlab/ldap/access_spec.rb

Note: authentication agains an other server, other then the first
still does not work. This will be completed in further MR's

It now just returns the results of the first server. A new call will replace
the existing to get results for a specific provider

- Use smarter instance methods
- Support multiple LDAP servers

More new code from CE 7.4 into EE

See merge request !191

Fix for project without group

See merge request !192

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

Conflicts:
	app/helpers/merge_requests_helper.rb
	doc/update/README.md
	lib/gitlab/reference_extractor.rb

Recent 7.4 code from CE into EE

Fixes #187

See merge request !190

Do not show ldap users in dropdowns

Fixes #160

See merge request !186

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

Conflicts:
	app/views/projects/edit_tree/show.html.haml

New milestone and label links

Fixes #1364

Fixes #1586

See merge request !1145

Signin after confirmation

Fixes #1471

See merge request !1146

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

Remove outdated comment on the project test seed

Remove assignment without effect.

Upgrade to Font Awesome v4.2