see also https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14557

Geo: Fix attachments/avatars saving to the wrong directory

Closes #3634

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

Use full URL of user avatar on webhook push

Closes #34339

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

Closes #3634

Add external link for online artifacts -- EE merge edition

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

Add external link for online artifacts

Closes #34102

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

Gitaly namespace service enabled for GitLab

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

Improve GitHub import performance

Closes #36288, #36292, and #38467

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

Improve GitHub import performance

Closes #36288, #36292, and #38467

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

Resolve "Navigating to another group board breaks navigation sidebar"

Closes #3397

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

Resolve "Protected branch form should have sane defaults for dropdowns"

Closes #32163

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

Save a query on the todos index page

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

Minor backport from EE

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

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

Send a confirmation email when the user adds a secondary email address

Closes #37385, #28621, and #36959

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

Only add identities to a user if we find one in Gitlab::OAuth::User.

Closes #38801

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

CE upstream

Closes gitaly#544, gitlab-qa#68, and gitaly#595

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

Update github.md importer docs to clarify branches from forks get created in GL

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

Remove database_geo.yml from Geo instructions

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

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

# Conflicts:
#	app/controllers/admin/users_controller.rb
#	app/controllers/confirmations_controller.rb
#	app/controllers/profiles/emails_controller.rb
#	app/models/user.rb
#	app/services/emails/base_service.rb
#	app/services/emails/destroy_service.rb
#	app/views/devise/mailer/confirmation_instructions.html.haml
#	lib/api/users.rb
#	spec/services/emails/destroy_service_spec.rb

Resolve "Monitoring hover info is clipped"

Closes #38031

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

Fixes group milestones breadcrumb links

Closes #38781

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