As seen in https://gitlab.com/gitlab-com/migration/issues/746, the numbers
appear to be off, particularly for Wikis. Until they are spot-on accurate, we
shouldn't use them.

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

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

Add Prometheus metrics to track Geo autocorrect numbers

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

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

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

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

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

[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

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"

Adjust self-hosted Jira development panel integration

Closes #6811

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

Merge branch 'ee-48834-chart-versions-for-applications-installed-by-one-click-install-buttons-should-be-version-locked' into 'master'

Ee addition for : 48834 chart versions for applications installed by one click install buttons should be version locked

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

Make CreateGpgSignatureWorker backwards compatible with original method signature

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

Older versions of GitPushService push a single commit SHA string to the queue,
but Gitaly requires that the parameters sent by CreateGpgSignatureWorker are
an array. It's possible to have old workers using this original signature or
jobs in the retry queue that would fail if CreateGpgSignatureWorker can't
handle the string form.

Resolve "Billing page style is broken"

Closes #7082

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

# Conflicts:
#	app/models/repository.rb

[ci skip]

Fix failing 500 errors when deploy tokens are used to clone

Closes gitlab-ee#7080

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

Fix deploy tokens without `expire_at` crashes

Closes #49904

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

A DeployToken responds to `:username`, but it returns the username for the
token, not a User object. Don't attempt to log user activity in this case.

Closes gitlab-org/gitlab-ee#7080

Get rid of unnecessary commit action in pipelines controller

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