Resolve conflicts in app/controllers/groups/group_members_controller.rb and app/controllers/projects/project_members_controller.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>

See discussion in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15682#note_51235136

EE- new nav tech debt

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

Port of 28869-es6-modules to EE

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

Fix successful rebase throwing flash error message

Closes #4304

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

Update empty state for service desk

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

Restructure HA DB docs to provide better flow and checkpoints

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

Docs: update admin docs

Closes #4258

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

Port of '40285-prometheus-loading-screen-no-longer-seems-to-appear' to EE

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

Fix order-dependent spec failure by avoiding monkeypatching

Closes #4312

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

Merge branch 'ee-tmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenter' into 'master'

[EE] Refactor member view by using presenter

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

Explicit QA Runtime::Browse that handles sessions better / EE

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

Use new Geo nodes settings pages in Gitlab QA

Closes #4306

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

Clean up new dropdown styles (EE port)

Closes gitlab-ce#39142 and gitlab-ce#39446

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

move new epic dropdown to ee namespace

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

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

Resolve conflicts in doc/development/limit_ee_conflicts.md and doc/development/automatic_ce_ee_merge.md
Signed-off-by: Rémy Coutable <remy@rymai.me>

Fix an exception in Geo scheduler workers

Closes #4309

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

Resolve "Geo: cache results in issue and message count being incorrect"

Closes #4070

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