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

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 intermittently failed click in dropdown in QA

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

Fix intermittent clone failure in QA

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

CE upstream - 2018-01-29 12:24 UTC

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

Fix intermittent QA error -- Expand button not bound to JS

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

Fix QA new project creation click on incorrect namespace

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

Resolve "Update docker report `unapproved`"

Closes #4332

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

Resolve "MR "Check out branch" button should be disabled when the source branch is deleted"

Closes #42255

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

Improve Nginx configuration files

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

Mute notifications in the seeder to speed GDK development

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

Fix MR revert check when no merged_at is present

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

Improve Geo database setup manual

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

Merge branch '4707-improve-geo-geo-disaster-recovery-docs-for-systems-with-multiple-secondaries' into 'master'

Resolve "Improve Geo Disaster Recovery documentation for systems with multiple secondaries"

Closes #4707

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

After source branch deletion the Merge request `Check out branch` button is disabled.

Fix JS equality rules in some specs

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

More conversions of $.ajax to axios

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

CE upstream - 2018-01-29 09:24 UTC

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

i18n flash message

Set alternate object directories in run_git

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

Resolve "Make tests running bundle install for gitaly more flexible"

Closes #42290

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

Digital Ocean Spaces now supports AWS v4 streaming API

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

See https://github.com/fog/fog-aws/issues/428#issuecomment-360869183

CE upstream - 2018-01-27 03:25 UTC

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

# Conflicts:
#	app/views/help/index.html.haml

[ci skip]

We always clone over HTTP, so if the QA spec attempts to clone over SSH, we know it gathered the wrong repo URI.