[ci skip]

CE upstream - 2018-01-30 06:24 UTC

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

Allow project to be set up to push to and pull from same mirror

Closes #4670

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

Fix JIRA not working when a trailing slash is included

Closes #42494

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

Leaving a trailing slash in the context option causes the jira-ruby
gem to add an extra slash in HTTP requests to the URL, preventing
JIRA from working properly.

Closes #42494

CE upstream - 2018-01-29 21:25 UTC

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

Fail static-analysis if there's output to stderr

Closes #41972

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

gitlab-ce!16708 port

Closes #4690

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

Return more consistent values for merge_status on MR API

Closes #20639

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

Preserve updated issue order to store when reorder is completed

Closes #4716

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

CE upstream - 2018-01-29 15:59 UTC

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

Replace $.post in edit blob with axios

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

Merge branch '2877-code-quality-requires-codequality-json-to-be-the-only-artifact-file-in-the-job' into 'master'

Resolve "Code quality requires `codequality.json` to be the only artifact file in the job"

Closes #2877

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

Fix cache clear windows

Closes #42487

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

Resolve "Intermittent spec failure in spec/models/commit_spec.rb"

Closes #42553

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

# Conflicts:
#	qa/qa/page/project/show.rb

[ci skip]

Close and do not reload MR diffs when source branch is deleted

Closes #37775

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

Move mr_widget_merged into a vue file

Closes #42486

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

Don't allow Repository#log with limit zero

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

Merge branch '42521-docs-update-usage-of-force-option-when-running-the-restore-raketask' into 'master'

Resolve "Docs update usage of force option when running the restore raketask"

Closes #42521

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

[CE backport] Fix intermittently failed click in dropdown in QA

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

Fix intermittently failed click in dropdown in QA

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

[CE backport] Fix intermittent clone failure in QA

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

Fix avatar icon missing when Gravatar is disabled

Closes #34733 and #38715

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

Fix intermittent clone failure in QA

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