EE Port of: Resolve "System level labels UI broken"

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

Override elasticsearch setting for STI note models

Closes #5705

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

Ee 36409 frontend for clarifying the usefulness of the search bar

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

CE upstream - 2018-08-07 00:21 UTC

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

Code Quality is supported on GitLab >= 10.4

Closes gitlab-ce#49516

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

need redis[master_password] instead of redis[password]

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

adding some output to repmgr master check command

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

Resolve "Increase width of left column in reports modal"

Closes #7128

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

Persist Epic Roadmap timescale choice

Closes #6293

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

# Conflicts:
#	locale/gitlab.pot

[ci skip]

Update CreateItemDropdown class to allow the glDropdown filterRemote option

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

Resolve "Improve Auto DevOps settings flow for admin and project"

Closes #47156

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

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

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

# Conflicts:
#	config/application.rb
#	locale/gitlab.pot

[ci skip]

CE upstream - 2018-08-04 09:23 UTC

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

Add support for Bitbucket Server imports

Closes #25393

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

Resolve "Open "View full report" in new window"

Closes #7124

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

Resolve "Charts with long label appear oversized"

Closes #48419

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

Revert "Merge branch 'bvl-instance-stats-default' into 'master'"

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

Persist 'auto devops' banner dismissal globally

Closes #48657

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

Respond to DB health in background migrations

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

Merge branch '7065-performance-metrics-not-rendered-properly-in-merge-request-widget-ee' of gitlab.com:gitlab-org/gitlab-ee into 7065-performance-metrics-not-rendered-properly-in-merge-request-widget-ee

Correct grammar on "Introduction to Git Flow" page in documentation

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

Retrieve merge request closing issues from database cache

Closes #44821

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

This reverts merge request !21044