Conflicts:
	app/assets/javascripts/boards/components/board_card.vue
	app/assets/javascripts/boards/models/issue.js
	app/assets/javascripts/subscription.js

Update docs to show use of high availability redis and sentinel roles

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

EE: Clean up schema of the "merge_requests" table

Closes gitlab-ce#31825

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

Resolve "`master` broken due to `static-analysis`"

Closes #4098

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

Fix QA test subject address by configuring capybara / EE

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

Integration tests for GitLab Geo

Closes #3765

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

(EE-port) Isolate the fork network background migrations

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

CE upstream - Wednesday

Closes gitlab-qa#103, gitaly#722, and gitlab-ce#39884

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

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

This adds various foreign keys and indexes to the "merge_requests" table
as outlined in https://gitlab.com/gitlab-org/gitlab-ce/issues/31825.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/31825

Troubleshooting for consul, Multiple private IPs

Closes gitlab-org/build/team-tasks#31

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

Add option to remote mirrors to only push protected branches

Closes #3843

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

Remove epic sidebar props that were added by bad merge conflict

Closes #4073

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

Move EE-only admin and group views to the top-level EE directory

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

Fix linking issues from subgroups to epics in parent group

Closes #4069

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

[EE] Adds Rubocop rule for line break after guard clause

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

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

[ci skip]

Remove duplicate mixins

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

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

Resolve "Add docs for gitlab slack app setup"

Closes #4043

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

Add next step link to ssh authorization geo step

Closes #4089

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

Geo: Ensure that repository deletions are communicated to the secondary

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

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

Update docs for Canary monitoring - docs

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

# Conflicts:
#   db/schema.rb