Jira dev panel docs update

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

Support manually stopping any environment from the UI (EE-port)

Closes gitlab-ce#25388

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

Merge branch '6850-docs-update-clarify-use-of-exact-phrase-searching-when-using-advanced-search' into 'master'

Resolve "docs update - clarify use of exact phrase searching when using advanced search"

Closes #6850

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

Part 1 of "Move EE JavaScript tests to their own respective directory"

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

Resolve "Primary geo node can't be removed from non-secondary machines"

Closes #6265

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

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