This reverts commit f4078760.

Since it can track multiple gaps

Resolve "Unable to load 'lib/gitlab/kubernetes/helm'"

Closes #7027

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

[ci skip]

[ci skip]

Merge branch '6877-geo-the-storage-config-in-the-other-section-is-broken-in-the-geo-nodes-admin-page' into 'master'

Resolve "Geo - The "Storage config" in the "Other section" is broken in the Geo nodes admin page"

Closes #6877 and #4851

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

Docs: add Starter badge to Jenkins integration

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

EE: Stop building Route rows on the fly

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

Add PolicyCheckable concern for things passing to policy check

Closes #7000

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

if all methods are also presented in the user.

EE-Port of gitlab-ce!20501

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

CE upstream - 2018-07-26 17:46 UTC

Closes gitlab-qa#303

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

raise SecondaryNotConfigured if Geo DB is not found

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

Resolve "Environments dropdown is showing on the cluster health page"

Closes #6919

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

Resolve ""Approved" is confusing / wrong wording in merge request widget"

Closes #5439

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

[master] Missing CSRF in System Hooks

See merge request gitlab/gitlab-ee!647

[master] EE: Don't expose project names in various counters

See merge request gitlab/gitlab-ee!638

# Conflicts:
#	Gemfile.lock
#	app/assets/javascripts/boards/index.js
#	app/assets/javascripts/vue_shared/components/reports/issues_list.vue
#	app/assets/javascripts/vue_shared/components/reports/report_issues.vue
#	app/helpers/environments_helper.rb
#	lib/gitlab/prometheus/queries/query_additional_metrics.rb
#	locale/gitlab.pot

[ci skip]

CE upstream - 2018-07-26 03:21 UTC

Closes gitlab-ui#11

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

Merge branch 'master' into '6877-geo-the-storage-config-in-the-other-section-is-broken-in-the-geo-nodes-admin-page'

# Conflicts:
#   db/schema.rb

Add left-padding to diverged-from-upstream label

Closes #7007

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

Full list of vulnerabilities

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

Full list of vulnerabilities

Closes #5239

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