CE upstream - Wednesday

Closes gitaly#182, gitlab-ce#31276, #1440, and gitlab-ce#22740

See merge request !1725

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

See merge request !1734

This was caused by
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10320Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

# Conflicts:
#	.gitlab-ci.yml
#	CHANGELOG.md
#	Gemfile.lock
#	app/views/projects/blob/_header.html.haml
#	config/database.yml.postgresql
#	db/schema.rb
#	scripts/prepare_build.sh
#	spec/features/merge_requests/diffs_spec.rb
#	spec/features/protected_branches_spec.rb
#	spec/javascripts/blob/blob_fork_suggestion_spec.js
#	spec/support/test_env.rb
#	yarn.lock
[ci skip]

Load a project's CI status in batch from redis

Closes #27376

See merge request !10785

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

See merge request !1723

[ci skip]

Wait for AJAX after steps defined in SharedActiveTab

Closes #31439

See merge request !10935

[ci skip]

[ci skip]

Add issues/:iid/closed_by api endpoint

Closes #26437

See merge request !10511

Refactoring rake task to import GitHub repositories

See merge request !10695

More merge request filters

Closes #26301

See merge request !10924

This manually merges https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10874
into master after resolving conflicts.

CE Upstream - Monday

Closes gitlab-ce#30637

See merge request !1708

Decrease ABC threshold to 57.08

See merge request !10724

Decrease Cyclomatic Complexity threshold to 16

See merge request !10928

Don't expect underlying DB data to be updated in feature spec

Closes #31437

See merge request !10934

Assignee filter on group issues/merge requests only loads group users

Closes #29490

See merge request !10884

Change issues sentence to use natural sorting

Closes #20378

See merge request !7110