# Conflicts:
#	changelogs/unreleased/18608-lock-issues.yml

# Conflicts:
#	app/assets/javascripts/notes/components/issue_comment_form.vue

Fix PG::UniqueViolation external_email migration

Closes #38246

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

Removes cycle analytics service and store from global namespace

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

Migrate Gitlab::Git::Repository#log to Gitaly

Closes gitaly#508

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

Prevent URL concatenation for avatars

Closes #38189

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

Improve list of sorting options

Closes #36929

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

Add context tabs to dashboard/projects

Closes #29045

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

Missing parens prevented this migration from working in some cases.

Closes #38246

Fixed fly-out error if mousePos array is empty

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

Resolve "Undefined run_command when running rake gitlab:check"

Closes #38280

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

Merge branch '38021-add-instructions-for-upgrading-from-ce-to-ee-using-gitlab-omnibus-chart-docs' into 'master'

Add instructions for upgrading from CE to EE using GitLab Omnibus chart - docs

Closes #38021

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

Re-allow `name` attribute on user-provided anchor HTML

Closes #38196

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

Refactor spec/policies/project_policy_spec.rb to minimize the diff with EE

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

Remove navbar gradient

Closes #37287

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

Remove Grit settings from default settings

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

fix minor spelling mistakes

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

[ci skip]

This is a follow-up to https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1956 and
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7308.

Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration

Closes #38246

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

`email_provider` by default is NULL, and if a user had not logged the
value would remain NULL. Upgrading to GitLab 10.0 would lead to a
PG::UniqueViolation because the post-deploy migration would attempt
to reinsert the entry because the NULL comparison between
`users.email_provider` and `user_synced_attributes_metadata.email_provider`
would never match.

Closes #38246

Workaround for n+1 in Projects::TreeController#show

Closes #38171

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

Allow the git circuit breaker to correctly handle missing repository storages

Closes #36549

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

fix typo in icons section

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

Workaround for #38259

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