# 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

Create merge request factory

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

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

[CE backport] Fix intermittent QA error -- Expand button not bound to JS

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

Fix QA new project creation click on incorrect namespace

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

[CE backport] Fix QA new project creation click on incorrect namespace

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

Replace $.post in awards handler with axios

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

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

* master: (21 commits)
  normalize headers correctly i18n flash message
  fixed dashboard projects not being filterable
  Converted filterable_list to axios
  Converted due_date_select to axios
  Converted dropzone_input to axios
  Converted create_merge_request_dropdown to axios
  converted compare_autocomplete to axios
  Convered compare.js to axios
  Set alternate object directories in run_git
  Digital Ocean Spaces now supports AWS v4 streaming API
  Fix spec failures in issues_spec.rb
  Fix #42486.
  Generalize toggle_buttons.js
  update code based on feedback
  add changelog
  fix spec
  add spec
  disable retry attempts for Import/Export until that is fixed
  add an extra spec
  fix validation error on services
  ...

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