# Conflicts:
#	app/assets/javascripts/environments/components/environment_item.vue
#	app/serializers/environment_entity.rb
#	app/views/admin/application_settings/show.html.haml
#	db/schema.rb
#	doc/ci/examples/README.md
#	doc/topics/autodevops/index.md
#	doc/user/project/merge_requests/index.md
#	lib/gitlab/git_access.rb
#	locale/gitlab.pot
#	spec/lib/gitlab/git_access_spec.rb
#	spec/serializers/environment_entity_spec.rb

[ci skip]

Make sure ConflictsService does not raise for conflicting submodules

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

Fix a typo on CI Runner page on Projects

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

Merge branch 'rd-6804-bug-unable-to-delete-branches-when-repo-reaches-the-size-limit-ce' into 'master'

Backport some changes from EE

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

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

Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'"

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

Fix a typo in Gitlab::Git::Repository

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

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

Resolve "Disable GCP free credit banner at instance level"

Closes #48578

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

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

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

This reverts merge request !20140

Rename code climate to code quality

Closes #6183

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

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

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

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

Rails5 MySQL fix rename_column as part of cleanup_concurrent_column_type_change for timestamps

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

could find it better?

Backport some changes made for this spec in EE

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

Update billing section to support GitLab.com trials

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

Update bitbucket.md to fix typo and small grammar touchups.

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