and remove stray merge conflict marker

Resolve "Improve visibility of deploy boards"

Closes #3328

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

Upgrade doorkeeper-openid_connect

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

Use API v4 during Geo OAuth authentication

Closes #3624

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

Limit the huge cross-database pluck for LFS objects and attachments

Closes #3645

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

[EE] Fix flaky examples tracking

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

Replace the 'project/merge_requests.feature' spinach test with an rspec analog

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

Geo - Selective replication allows admins to select any groups

Closes #3258

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

Rebase using git worktree

Closes #1604

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

`/api/v3/user` and `/api/v4/user` behave exactly the same, so prepare
for removal of API v3, and use v4 instead.

Closes gitlab-org/gitlab-ee#3624.

pgloader docs

Closes #2799

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

EE Port of "Lock discussion for issues and merge requests"

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

This repeats the approach used in #3629 to limit the huge `NOT IN`
fragment.

Closes #3645

Don't create todos for old issue assignees

Closes #3642

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

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

Document how to use pgloader

Closes gitlab-ee#2799

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

# Conflicts:
#	doc/user/permissions.md

[ci skip]

Save Geo files to a temporary file and rename after success

Closes #3618 and #3242

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

Geo: Fix attachments/avatars saving to the wrong directory

Closes #3634

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

Closes #3618

Closes #3634

Add external link for online artifacts -- EE merge edition

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

Resolve "Navigating to another group board breaks navigation sidebar"

Closes #3397

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