# Conflicts:
#	config/routes.rb

[ci skip]

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

Closes gitlab-org/quality/staging#2

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

Don't use arguments keyword in gettext script

Closes #50457

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

Moves spec files for job log components into components folder

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

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>

Resolve "Download artifacts button not available on mobile"

Closes #50524

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

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-ce!21215

Update `gitlab` chart docs for GA

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

Allow project owners to set up forking relation through API

Closes #40550

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

Port of tc-api-fork-owners to EE

Closes gitlab-ce#40550

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

Resolve "Separate remembering sorting issues/merge requests"

Closes #49993

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

Backport of gitlab-org/gitlab-ee!6876

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

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

Resolve "[QA] Automation Triage 11.1.0 RC9 - Filling textarea with deploy key timeouts sometime"

Closes #49179

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

Add JIRA service specs to commit object

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

Resolve "Wiki: links with spaces in the url render incorrectly with CommonMark"

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

[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