Conflicts:
	lib/gitlab/ci/config.rb

Sort epics by start date and end date in the roadmap view and epics list view

Closes #6494

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

Fix tooltip string to support dynamic date type in Epic sidebar

Closes #7450

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

Merge branch 'ee-limit-navbar-search-for-current-project-or-group-for-small-viewports' into 'master'

Limit navbar search for current project or group for small viewports

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

Merge branch '7455-update-tests-metadata-is-broken-since-https-gitlab-com-gitlab-org-gitlab-ee-merge_requests-7207' into 'master'

Resolve "update-tests-metadata is broken since https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7207"

Closes #7455

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

Resolve "[Rails5] Make GeoMigrationGenerator compatible with Rails 5"

Closes #7074

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

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

CE upstream - 2018-09-04 14:32 UTC

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

Explain how to use a specific identity in a repo

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

Add search to group labels page (EE port)

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

Conditional partial rendering for EE in application settings

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

Merge branch 'ee-50991-qa-page-shared-clonepanel-should-be-moved-to-page-component-clonepanel-qa' into 'master'

[EE] [QA] Move Page::Shared::ClonePanel to Page::Component::ClonePanel

Closes gitlab-ce#50991

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

Resolve "Protected Environments follow up: Feature specs"

Closes #7200

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