This reverts commit 98d881d2.

# Conflicts:
#	app/views/projects/clusters/_sidebar.html.haml
#	locale/gitlab.pot

[ci skip]

Update read-only message banner styling for Geo secondary node

Closes #4966

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

Updates to `.po` & `.pot` linting

Closes #46096 et #39292

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

Memoize the global default for push rules within the request

Closes #6465

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

CE upstream - 2018-06-18 15:21 UTC

Closes gitlab-runner#2211

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

port 5956-auto-devops-multi-cluster-help-text to CE

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

Resolve "Geo: Slow JOIN query with project_repository_states"

Closes #6053

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

CE upstream - 2018-06-18 09:22 UTC

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

Allow trailing whitespace on blockquote fence lines

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

Redirect favicon.(png|ico) to actual favicon asset or upload

Closes #47840

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

Update README.md to clarify EFS is slow and not to use this guide.

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

Rails5 fix db check: connection execute returns integer instead of string

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

Merge branch 'blackst0ne-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-namespace' into 'master'

Resolve "[Rails5] Invalid single-table inheritance type: Group is not a subclass of Namespace"

Closes #48014

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

Rails5 fix passing Group objects array into for_projects_and_groups milestone scope

Closes #48012

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

Document Custom build directories

Closes gitlab-runner#2211

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

fixed broken link to git cheat sheet

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

Resolve "Creating a deploy token doesn't bring back to the creation page"

Closes #46429

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

Grammar fixes in EE build script

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

Render calendar feed inline when accessed from GitLab

Closes #47672

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

Merge branch 'blackst0ne-rails5-expected-the-response-to-have-status-code-ok-but-it-was-404' into 'master'

Resolve "[Rails5] expected the response to have status code :ok but it was 404"

Closes #48008

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

Rails5 update Gemfile.rails5.lock

Closes #48009

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

Resolve "[Rails5] expected: "/search?search=seed_project" got: nil"

Closes #48013

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

[Rails5] Fix pipeline_schedules_controller_spec

Closes #48011

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

Expose a clean_backtrace method from Gitlab::Profiler

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

Rails5 fix update_attribute usage not causing a save

Closes #47960

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

[Rails5] Explicitly set request.format for blob_controller

Closes #47921

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

With text/calendar as Content-Type, the browser always downloads the
content as a file (even ignoring the Content-Disposition header). We
want to display the content inline when accessed from GitLab, similarly
to the RSS feed.

Resolve "Milestone not updating in MR sidebar after selection"

Closes #47933

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

Resolve "Follow-up from "Add assignee lists to boards""

Closes #6321

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