Update ldap.md to clarify uid should list the attribute not the value

See merge request !1734

Improve GitLab Geo documentation

See merge request !1714

refactor ee-docs landing page

Closes #2240

See merge request !1702

Add custom LDAP user and group sync settings

See merge request !1636

Port of: Load pipeline status for a project in batch from redis

See merge request !1723

[ci skip]

[ci skip]

CE Upstream - Monday

Closes gitlab-ce#30637

See merge request !1708

This is a port of
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10785 to EE.

Configure Gitaly through settings file instead of ENV vars

See merge request !1645

Conflicts:
   app/helpers/blob_helper.rb
   app/views/projects/blob/_header.html.haml

Fix diffs with edit-forking needs -- EE merge edition

Closes gitlab-ce#31276 and gitlab-ce#30637

See merge request !1705

Bump mysql2 gem from 0.3.16 -> 0.4.5

See merge request !1715

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ee-31276-fix-diffs-with-edit-forking-needs

Conflicts:
	app/assets/javascripts/blob/blob_fork_suggestion.js
	app/assets/javascripts/dispatcher.js
	spec/javascripts/blob/blob_fork_suggestion_spec.js

See https://gitlab.slack.com/archives/C0GQHHPGW/p1493136800695415
See https://gitlab.slack.com/archives/C41AN6LH4/p1493137591740753

Swap a before_save call with a before_create/before_update pair to avoid a confict with elasticsearch-model

Fix for spinach: \'New Project :: I should see instructions on how to import from Git URL :: When I click on "Repo by URL"\'

Use jQuery niceness on blob_fork_suggestion -- EE merge edition

See merge request !1706

Fix incorrect spec filenames which were ingored by CI

Closes #2250

See merge request !1709

Refactor deploy boards into vue files

See merge request !1694

Appears to fix some issues in Timeout: https://github.com/brianmario/mysql2/releases

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

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31276

Conflicts:
	app/views/projects/blob/_header.html.haml

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30637

Added info about Admin user ability to push to protected branches.

See merge request !1009

Test both PostgreSQL and MySQL for the win

See merge request !1646