Fix a bug where user was unable to delete a branch when repo size was above the limit

Closes #6804

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

Show the conflicted diff only in ee-specific-lines-check

Closes #6856

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

CE upstream - 2018-07-10 00:21 UTC

Closes gitaly#1252, gitlab-qa#291 et gitlab-ce#47797

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

port 48578-disable-gcp-free-credit-banner-at-instance-level to EE

Closes gitlab-ce#48578

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

Rename code climate to code quality

Closes #6183

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

Resolve "Extract EE specific files/lines for spec/mailers, app/mailers/preview"

Closes #6117

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

Revert "Merge branch 'gitaly-with-config' into 'master'"

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

could find it better?

Update billing section to support GitLab.com trials

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

# Conflicts:
#   locale/gitlab.pot

This reverts merge request !6428

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

# Conflicts:
#	spec/models/ci/build_spec.rb
#	spec/models/user_spec.rb

[ci skip]

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

Fix link to frontend in handbook

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

Shorten CHANGELOG filename to avoid breaking ecryptfs users

Closes #49038

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

[ci skip]

Closes #49038

Replace 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml

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