Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Remove Grit settings from default settings

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

fix minor spelling mistakes

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

fix minor spelling mistakes

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

Docs: fix internal link

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

[ci skip]

[ci skip]

[ci skip]

[ci skip]

[ci skip]

[ci skip]

[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

Inform user that current shared projects will remain shared

Closes #38220

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

Fix NoMethodError: undefined method `>' for nil:NilClass in license.rb

Closes #3513

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

See https://gitlab.com/gitlab-org/gitlab-ce/issues/38261

Removed old icons from project page

Closes #36567

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

Don't show %board-add-issues-modal if there's no project

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

Make branches page translatable

Closes gitlab-ce#32797

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

Make branches page translatable

Closes #32797

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

CE upstream: Friday

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

Demonstrate <details> and <summary> tags in doc/user/markdown.md

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

Add notes on authentication to PG HA document

Closes omnibus-gitlab#2735

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