See
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14272#note_41419104

Conflicts:
	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js

Conflicts:
	app/models/license.rb

Improve the IssuableFinder#SCALAR_PARAMS array formatting and add EE_SCALAR_PARAMS

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

Only run Geo backfill for projects on healthy shards

Closes #3360

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

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

Add note for upgrading Helm chart prior to 1.3.5

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

Add note for upgrading Helm chart prior to 1.3.5 - docs

Closes #38374

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

Port of remove-old-nav-styles to EE

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

CE Upstream - Monday

Closes gitaly#524

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

Gracefully handle case where current instance is not a Geo Node

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

Send valid project path as name for Jira dev panel integration

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

Remove the backoff delay from Geo repository sync

Closes #3453

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

Fix an error reporting some failures in the elasticsearch indexer

Closes #3516

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

Improve list of sorting options

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

Gracefully handle and report SSL connection errors in Geo admin screen

Closes #3460

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

Point to embedded Consul

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

Refactor spec/policies/project_policy_spec.rb to minimize the diff with CE

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

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

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

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

Remove Grit settings from default settings

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

fix minor spelling mistakes

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

fix minor spelling mistakes

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

If the primary Geo Node were deleted or not configured properly,
attempts to retrieve the status of secondaries would fail with an
Error 500.

Docs: fix internal link

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

[ci skip]