CE Upstream - Monday

Closes gitaly#524

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

Gracefully handle case where current instance is not a Geo Node

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

Send valid project path as name for Jira dev panel integration

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

Remove the backoff delay from Geo repository sync

Closes #3453

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

Fix an error reporting some failures in the elasticsearch indexer

Closes #3516

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

Improve list of sorting options

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

Gracefully handle and report SSL connection errors in Geo admin screen

Closes #3460

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

Point to embedded Consul

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

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

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

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

If the primary Geo Node were deleted or not configured properly,
attempts to retrieve the status of secondaries would fail with an
Error 500.

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