# Conflicts:
#	app/assets/javascripts/boards/components/issue_card_inner.js
#	app/assets/javascripts/boards/components/modal/footer.js
#	app/assets/javascripts/boards/components/sidebar/remove_issue.js
#	app/assets/javascripts/boards/stores/boards_store.js

Fix Service Desk emails

See merge request !1638

CE upstream to EE master (Tue)

Closes #1369 and gitaly#173

See merge request !1628

We now explicitly set an `@unsubscribe_url`.

Setup and run a Gitaly server for testing if GitalyClient is enabled

See merge request !1601

Add ce-to-ee guide for 9.1

See merge request !1631

Separate EE params from CE on Grape API

See merge request !1585

Fix edit button on blame page without repo perms -- EE merge edition

Closes gitlab-ce#30636

See merge request !1621

EE port of dm-outdated-diff-link

See merge request !1625

Without repo permissions, pressing the "Edit" button on the blame page
will now prompt to Fork/Cancel.

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30636

Conflicts:
	app/views/projects/blob/_header.html.haml

EE port of dm-remove-copy-link-on-blame-page and dm-remove-copy-link-on-svgs

See merge request !1624

Cache Gitlab::Geo queries

Closes #1983

See merge request !1507

Issue board focus mode docs

See merge request !1618

# Conflicts:
#   app/views/projects/blob/_header.html.haml

CE upstream - Friday

Closes gitlab-ce#30496, gitlab-ce#27262, and gitlab-ce#29193

See merge request !1605

Fix bad resolved conflict for app/assets/javascripts/environments/folder/environments_folder_view.js

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

Only shows loading for the first request

Closes #2117

See merge request !1620

Make webpack-dev-server process more resilient when switching branches.

Closes #30678

See merge request !10581

Fix redundant cache expiration in Repository

Closes #30146

See merge request !10575