# Conflicts:
#	.rubocop.yml
#	app/controllers/concerns/service_params.rb
#	config/application.rb
#	doc/api/groups.md
#	lib/api/helpers.rb
#	lib/extracts_path.rb
#	lib/gitlab/shell.rb
#	lib/gitlab/slash_commands/presenters/issue_base.rb
#	spec/lib/gitlab/shell_spec.rb
#	spec/support/stub_configuration.rb

[ci skip]

Hide runner token in CI/CD settings page

Closes #38019

See merge request gitlab-org/gitlab-ce!15918

Fix wording in Add Cluster tooltip

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

[ci skip]

[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

Change CI config to use new base image

See merge request gitlab-org/gitlab-ce!15939

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

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

See merge request gitlab-org/gitlab-ce!12800

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

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

fix issue #39843 Incorrect guidance stating blocked users will be removed from groups and projects as members

Closes #39843

See merge request gitlab-org/gitlab-ce!15947

fix issue #39843 Incorrect guidance stating blocked users will be removed from groups and projects as members

Update feature toggle design to use icons and make it i18n friendly

Closes #38239

See merge request gitlab-org/gitlab-ce!15904

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

Replace factory_girl_rails with factory_bot_rails

See merge request gitlab-org/gitlab-ce!15919

[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

Export JS classes as modules

See merge request gitlab-org/gitlab-ce!15952

Don't use Markdown cache for stubbed settings in specs

Closes #41130

See merge request gitlab-org/gitlab-ce!15954

Make help link open in new tab

Closes #41073

See merge request gitlab-org/gitlab-ce!15912

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.