# Conflicts:
#	spec/lib/gitlab/import_export/all_models.yml

[ci skip]

CE upstream - 2018-03-30 15:25 UTC

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

Merge branch 'theothertom/gitlab-ce-bug/42663/update-jira-integration-docs-for-new-jira-UI-docs' into 'master'

Update Jira integration docs for new Jira UI

Closes #42663

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

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

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

Extend API for exporting a project with direct upload URL

Closes #42685

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

Add closed by information to issue API

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

[port https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17042] Add closed by information to issue API

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

Add changelog entry for rake task fix

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

Move group create project permissions to Starter

Closes #5457

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

Geo: Fix inconsistent project registry queries

Closes #5430

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

# Conflicts:
#	doc/api/jobs.md
#	locale/gitlab.pot

[ci skip]

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4855 introduces a
change which nullifies issues.closed_at whenever one reopens a issue.
Which is not currently expected by the burndown charts. Hence we're now
using the events.created_at information.

Free open file descriptors and libgit2 buffers in UpdatePagesService

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

Don't let the Runner clone/fetch prior to the package-and-qa job

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

CE upstream - 2018-03-30 12:25 UTC

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

Resolve "Migrate upload task fails for Upload with `store: nil`"

Closes #44774

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

Resolve "doc/api/jobs.md should be harmonized between CE and EE"

Closes #44835

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

Do it by hand instead, that way we can still run this job even if the
branch has been removed.
Signed-off-by: Rémy Coutable <remy@rymai.me>

Updating runner docs to add specific runner to projects from the admin area-doc

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

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

Remove duplicate entry for CI_PIPELINE_SOURCE

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

updating approval docs to clarify reset when target branch changes

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

Update jobs.md to download artifacts with curl using `-L`

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

Tweak restore rake task to provide an option to set alternate temporary backup directory

Closes #42593

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

remove duplicated string

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

Update no repository placeholder

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

Add doc section in HA Load Balancer to outline SSL options

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

Update no repository placeholder

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

Add gitlab-pages port number to artifacts links, if needed

Closes #44398

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