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

Port of ccr/6274/add_weight_to_payload to CE

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

Add weight to issue hook

Closes #6274

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

Docs update ha aws diagram

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

Add authenticate to events api. fix #49255

Closes #49255

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

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

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

fix broken pathing (remove extraneous ../)

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

Resolve "UX bug in CI Runner settings on projects with many runners"

Closes #42754

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

When importing a project, after clicking 'Create Project' button, user is
redirected either to to the project's import page or project's show page
depending whether import is still in progress.

The difference in behavior is probably caused by `test_after_commit`
which is now included in Rails 5.

Jira needs to be given a bare domain (no path) for its configuration,
otherwise it confuses itself and does not use the proper API endpoints.
This was the reason why we always say requests like `/-/jira/pulls`
before (it uses whatever path is given always)

Resolve "Job page illustration overflows on mobile"

Closes #48145

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

Resolve "Remove redundant header from metrics page"

Closes #50019

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

add initial smoke tests and documentation

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