(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

# Conflicts:
#	README.md
#	app/controllers/autocomplete_controller.rb
#	app/finders/autocomplete/users_finder.rb
#	app/models/user.rb
#	changelogs/unreleased/6010_remove_gemnasium_service.yml
#	doc/ci/README.md
#	doc/user/project/integrations/project_services.md
#	lib/api/services.rb
#	lib/gitlab/hook_data/issue_builder.rb
#	lib/gitlab/hook_data/merge_request_builder.rb
#	spec/models/user_spec.rb

[ci skip]

Resolve "Fix bad test from 20765 MR"

Closes #50323

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

A forked project stores its LFS objects in the `forked_from_project`.
So the LFS objects become inaccessible, and therefore delete them from
the database so they'll get cleaned up.

To be refactored when implementing
https://gitlab.com/gitlab-org/gitlab-ce/issues/39769

Before this change only GitLab admins where allowed to set up forking
relation through the API. This changes that so project owners can
do this too.

Closes gitlab-org/gitlab-ce#40550.

[QA] Improve the fork scenario to take a username and password instead of always…

Closes gitlab-org/quality/staging#2

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