added custom ldap gem to enable ldap filter and full name support #custom
Merge remote-tracking branch 'origin/6-1-stable' into ldap-filter

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/merge_request.rb
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
	lib/support/init.d/gitlab
	lib/support/nginx/gitlab
Merge remote-tracking branch 'origin/6-2-stable' into ldap-filter

Conflicts:
	Gemfile.lock
	lib/tasks/sidekiq.rake
Merge remote-tracking branch 'origin/6-3-stable' into ldap-filter

Conflicts:
	Gemfile.lock
	VERSION
	doc/install/installation.md
	lib/tasks/gitlab/check.rake
Merge remote-tracking branch 'upstream/6-8-stable' into ldap-filter

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	doc/install/installation.md
	doc/update/6.2-to-6.3.md
	lib/support/nginx/gitlab
Merge branch 'ldap-filter' into 6-8-custom