# 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

Resolve "Pipeline job log page uses too much CPU for loading animation"

Closes #49776

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

Enable frozen string for app/models/**/*.rb

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

[Rails5] Fix GROUP BY for mysql

Closes #6932

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

Show License Management at pipeline level

Closes #5491

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

Removes EE specific CSS that was moved to CE

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

EE port of Frontend code for "JUnit XML Test Summary In MR widget"

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

Frontend code for "JUnit XML Test Summary In MR widget"

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

Fix spec warnings and template helper

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

Fix project templates failures

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

Resolve "Show the full list of licenses in the MR widget if no report is available in the target branch"

Closes #6589

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

Resolve "Show the full list of licenses in the MR widget if no report is available in the target branch"

Improve blocked user tracking and fire some events only once

Closes #49784

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

Resolve "Merge request e-mail link has full URL"

Closes #49899

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

Update query simplification

Closes #49873

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve "Unicorn development settings should match production as much as possible"

Closes #49756

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