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

Grammar fixes in EE build script

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

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

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

Make Gitaly wiki RPC's mandatory

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

Fix queue_name in Rails 5

Closes #47372

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

CE upstream - 2018-06-17 18:24 UTC

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

Remove the ci_job_request_with_tags_matcher

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

Optimise paused runners

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

We have long polling mechanism which is not being used by paused runners.
This makes the paused runner to generate a request every 3s,
where it could be fired only every 1h.

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

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

Harmonize theme preferences previews

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

Refactor sessions_controller_spec to work both in rails4 and rails5.
Remove the stubbed `request.referer` method, set real header instead.

CE upstream - 2018-06-16 06:21 UTC

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

In Rails 5.0 there's a bug [1] in controller tests that doesn't parse
nested parameters correctly.

This commit brings a workaround to make specs work again both in rails4
and rails5.

[1]: https://github.com/rails/rails/issues/23997

CE upstream - 2018-06-16 00:22 UTC

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

Resolve "BS4: Mini graph dropdown sometimes open on the top"

Closes #47610

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

Resolve "Pipeline dropdown shifts around at smaller screen sizes"

Closes #47068

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

Remove small container width

Closes #36439

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

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

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

Resolve "Wiki git clone holder and dropdown is broken"

Closes #47917

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