CE upstream - 2018-07-09 13:37 UTC

Closes gitaly#331, gitaly#384, gitaly#446, gitaly#383, gitaly#593, gitaly#566, gitaly#670, gitaly#528, and gitaly#222

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

Geo: Fix repository updated replication race condition

Closes #5489

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

Use gitaly to set/unset git config

Closes gitaly#1241

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

add issue links to API README

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

Add missing translations

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

Remove badges from README.md in favor of GitLab badges feature

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

EE: Update rubocop

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

Fix handling of annotated tags when Gitaly is not in use

Closes gitlab-ce#47797

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

# Conflicts:
#	db/schema.rb
#	doc/ci/variables/README.md
#	locale/gitlab.pot

[ci skip]

* update-rubocop:
  Use stable gitlab-styles and eliminate offenses
  Updates from `rubocop -a`
  Update rubocop to get rid of a warning in other MR

CE upstream - 2018-07-07 03:21 UTC

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

Add note about the k8s namespace of installed applications

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

updates version for CI_JOB_URL and CI_PIPELINE_URL to 11.1

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

Append `skip ci` to Crowdin commit messages

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

This is an undocumented feature of the Crowdin configuration.

This will append `[skip ci]` to all commit messages from Crowdin,
avoiding 100s of pipelines to be created.

The pipeline will need to be run manually for these merge requests
instead.

Resolve "MR refactor: Performance costs of main element with `v-if`"

Closes #48898

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

Merge branch '48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace' into 'master'

Resolve "[Rails5] Invalid single-table inheritance type: Group is not a subclass of Gitlab::BackgroundMigration::FixCrossProjectLabelLinks::Namespace"

Closes #48976

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

Rails5 fix AttachmentRegistryFinder arel queries

Closes #6742, #6745, and #6743

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

Add documentation on private projects

Closes #48955

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

Updates to the `gettext:updated_check`

Closes #48952

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