# Conflicts:
#	app/assets/javascripts/environments/components/environment_item.vue
#	spec/fixtures/api/schemas/entities/merge_request_widget.json

[ci skip]

CE upstream - 2018-08-03 18:21 UTC

Closes gitlab-ce#49862

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

Revert some unneeded code changes from environment list

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

Port of protected environments frontend changes from EE to CE

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

app/services/projects/hashed_storage/migrate_repository_service.rb

app/services/projects/hashed_storage/migrate_attachments_service.rb

Add group milestones to dashboard milestone page

Closes #35748

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

Resolve "Commit messages are no longer monospace, but still white-space: pre-wrap"

Closes #47548

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

EE - Resolve "Commit messages are no longer monospace, but still white-space: pre-wrap"

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

Parse junit.xml.gz and calculate the difference between head and base

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

# Conflicts:
#	app/assets/stylesheets/framework/mixins.scss
#	app/services/projects/hashed_storage/migrate_attachments_service.rb
#	app/services/projects/hashed_storage/migrate_repository_service.rb
#	app/services/projects/update_service.rb
#	locale/gitlab.pot

[ci skip]

Add Prometheus metrics to track Geo autocorrect numbers

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

Rails5: update Rails5 lock for forgotten gem rouge

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

Merge branch '5195-geo-actively-try-to-correct-verification-failures-on-the-secondary' into 'master'

Resolve "Geo: Actively try to correct verification failures on the secondary"

Closes #5195

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

CE upstream - 2018-08-02 21:23 UTC

Closes #7080, gitaly#749, gitaly#1212, gitaly#1195 et gitaly#953

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

Update proofreader.md

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

Merge branch 'ee-46940-hashed-storage-extend-enable-hashed-storage-for-all-new-projects-to-for-all-new-and-renamed-projects' into 'master'

EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19747

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

Merge branch '46940-hashed-storage-extend-enable-hashed-storage-for-all-new-projects-to-for-all-new-and-renamed-projects' into 'master'

Resolve "Hashed storage: extend "Enable hashed storage for all new projects" to "for all new and renamed projects""

Closes #46940

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

Resolve "Hashed storage: extend "Enable hashed storage for all new projects" to "for all new and renamed projects""

port 49776-pipeline-job-log-page-uses-too-much-cpu-for-loading-animation to EE

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