If issues are filtered by multiple labels, then GROUP BY statement
is used to filter only issues with these labels. This is problem in
combination with '.includes' which may use JOIN statement to load
associated resources in single query instead of a separate query.

Then the generated SQL query fails because associated resources
are included in 'SELECT ...' statements but not in the GROUP BY
statement.

Usage of '.preload' instead of '.includes' ensures that Active Record
uses a separate query instead of JOIN.

Closes #4376

EE port of ph-es-notes-module

See merge request gitlab-org/gitlab-ee!3812

[Backport] Stop sending milestone and labels for Projects::MergeRequestsController#show.json requests

See merge request gitlab-org/gitlab-ee!3780

ee - Only render signout screen when user is signed out

See merge request gitlab-org/gitlab-ee!3784

With laravel's package auto-discovery, the composer install fails when it tries…

See merge request gitlab-org/gitlab-ee!3345

# Conflicts:
#   app/assets/javascripts/main.js

EE port of ph-even-more-es-modules

See merge request gitlab-org/gitlab-ee!3797

Rename QA scenarios to make factory concept explicit / EE

See merge request gitlab-org/gitlab-ee!3796

Fix loading spinner for the weight block in the Issue Boards

Closes gitlab-ce#41178

See merge request gitlab-org/gitlab-ee!3801

requests

Hide runner token in CI/CD settings page -- EE merge edition

Closes gitlab-ce#38019

See merge request gitlab-org/gitlab-ee!3773

Fix wording in Add Cluster tooltip

See merge request gitlab-org/gitlab-ee!3790

[ci skip]

[ci skip]

CE upstream - Thursday

Closes #4325, gitlab-ce#36054, #4277, #10, gitlab-ce#33926, gitlab-qa#102, gitaly#793, and gitlab-ce#39608

See merge request gitlab-org/gitlab-ee!3787

Only try AWS instance profile creds if needed

See merge request gitlab-org/gitlab-ee!3798

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

EE:  Add cop to make sure we don't use ivar in a module

See merge request gitlab-org/gitlab-ee!3008

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

Regressed in CE->EE MR because it wasn't condidered to be
a conflict by git, see
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3633/diffs#f945183105ed1222efad338f5edfc05b00f59c56_28_28

Merge branch 'fix-wording-add-clusters' of gitlab.com:gitlab-org/gitlab-ee into fix-wording-add-clusters

simplify git-annex to LFS migration guide

See merge request gitlab-org/gitlab-ee!2859

Add link to runner security

See merge request gitlab-org/gitlab-ee!3725

[EE] Replace factory_girl_rails with factory_bot_rails

See merge request gitlab-org/gitlab-ee!3783

This is a bad smell that we should fix

Don't use Markdown cache for stubbed settings in specs

See merge request gitlab-org/gitlab-ee!3793

Make help link open in new tab

See merge request gitlab-org/gitlab-ee!3759

Fix broken test mocking the wrong tool

Closes #4350

See merge request gitlab-org/gitlab-ee!3792

`Aws::InstanceProfileCredentials.new` actually performs an API request to AWS,
which can result in us hitting a rate limit.

Rewrite `Gitlab::Elastic::Client.resolve_aws_credentials` to the slightly more
verbose, but equally clear, variant, to ensure that we don't call this unless we
have to - i.e. the static credentials do not work.

* ee/master:
  Added Authorized Keys specific checks for Geo
  Simplify database replication instructions and make dryer
  Add SAST docs for EE
  Combine ssh docs and rename the doc
  Docs: update documentation guidelines
  Replace gl.utils.formatDate in place of exported function
  Add deprecated page back in
  Docs: add indexes for monitoring and performance monitoring
  Add docs for commit diff discussion in merge requests
  Import gitlab_projects.rb from gitlab-shell
  Show clear message when set-geo-primary-node was successful
  fix formatting of parameters for new group and transfer project to group