(cherry picked from commit 0e2c177f8885f5da7e5495570b104512c0f1b4d8)

(cherry picked from commit 24976fc29339724c9ace56a53f83c147e556c043)

(cherry picked from commit 064af4357e88cdacc0d24eb62b3589542ff47d1d)

(cherry picked from commit 10a680ba04b5a159546c9c871e38e596e907f3f8)

Conflicts:
	locale/gitlab.pot

(cherry picked from commit 024e05f2d1f07ea9cff2d458b89d8dd210cd1a23)

(cherry picked from commit 6bfc539717c8a247a87a913808b813bbd2cb1d99)

(cherry picked from commit 0534db8b59819dea6396e4d2ddacd48213551cce)

(cherry picked from commit 72c5fc73df4be39a6aa6265aa3584147d922e63e)

(cherry picked from commit fae85677212906bb8dce2bf5dc797a71d1ee9d1b)

Conflicts:
	app/helpers/sorting_helper.rb

(cherry picked from commit 8e8cc0b32a08334c4db8492f707ff7d39ab6ebca)

Conflicts:
	app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js

for the current usage for the issues search bar a specific instance of
FilteredSearchTokenKeys is created, which contains the config for that
case.

(cherry picked from commit d4387d88)

Conflicts:
	app/assets/javascripts/pages/groups/issues/index.js
	app/assets/javascripts/pages/projects/issues/index/index.js

(cherry picked from commit 0a0350be)

(cherry picked from commit 16d12491)

Conflicts:
	app/views/admin/runners/index.html.haml

(cherry picked from commit bbc305b1)

(cherry picked from commit f0d0400d)

(cherry picked from commit 00647b31)

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

Closes gitlab-org/quality/staging#2

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

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

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

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

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

make `karma -f` work again

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

Update `gitlab` chart docs for GA

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

Port of tc-api-fork-owners to EE

Closes gitlab-ce#40550

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

Resolve "All Gitlab branches listed in Jira task in Development section"

Closes #6752

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

Resolve "Follow up - Protected Environments: Use limited count approach"

Closes #7175

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

[Rails5] Fix project's path check

Closes #7081

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