# 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

Skip issuable without a project in IssuableExtractor#extract

Closes #31280

See merge request !10906

Ensures that OAuth/LDAP/SAML users don't need to be confirmed

Closes #31294

See merge request !10926

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

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

Only assert that the page shows something, this waits for requests
to be completed.
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>

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 gitlab-shell version to 5.0.3

See merge request !10922

Merge branch '30692-document-rspec-profile-and-mysql-branch-testing-and-remove-ci_setup-doc-page' into 'master'

Remove outdated ci_setup.md doc page and document MySQL and RSpec profiling for specific branches

Closes #30692

See merge request !10916