# Conflicts:
#	lib/rspec_flaky/flaky_examples_collection.rb

[ci skip]

Resolve "Clean outdated flaky specs from the flaky specs report"

Closes #37721

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

[EE] Resolve "Clean outdated flaky specs from the flaky specs report"

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

Replace the `project/issues/milestones.feature` spinach test with an rspec analog

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

Replace the `project/commits/branches.feature` spinach test with an rspec analog

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

Resolve "When editing a comment in an issue, the preview mode is toggled in the main textarea"

Closes #44697

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

CE upstream - 2018-04-11 09:27 UTC

Closes #5444

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

Branch with a commit detection defaults to Gitaly

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

Tag with a commit detection defaults to Gitaly

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

Don't send schedule confirmations for chat jobs

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

Fix file-specific variables collection item option

Closes gitlab-ee#5444

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

Fixed markdown preview in IDE not working for new files

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

[Rails5] Fix admin/application_settings_controller

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

By default this was an OPT_IN RPC, and now graduates to OPT_OUT as the
acceptance testing was successful in:
gitaly#1009

This follows the conventions of our [migration
process](https://gitlab.com/gitlab-org/gitaly/blob/master/doc/MIGRATION_PROCESS.md)

By default this was an OPT_IN RPC, and now graduates to OPT_OUT as the
acceptance testing was successful in:
https://gitlab.com/gitlab-org/gitaly/issues/1008

This follows the conventions of our [migration
process](https://gitlab.com/gitlab-org/gitaly/blob/master/doc/MIGRATION_PROCESS.md)

[CE Backport] Fix email handler spec for EE

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

The `RAILS5=1 rspec spec/controllers/admin/application_settings_controller_spec.rb`
command throws the error:

Failures:

  1) Admin::ApplicationSettingsController PUT #update falls back to defaults when settings are omitted
      Failure/Error: import_sources = params[:application_setting][:import_sources]

      NoMethodError:
        undefined method `[]' for nil:NilClass
      # ./app/controllers/admin/application_settings_controller.rb:62:in `application_setting_params'

This commit fixes it.

CE upstream - 2018-04-11 00:24 UTC

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

Fix enviroments seeding on certain branch names

Closes #45051

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

CE upstream - 2018-04-10 20:31 UTC

Closes gitlab-development-kit#335

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

Update vendored .gitlab-ci.yml for Auto-Devops

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

Use axios in the stage component

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

Make sure hooks run when seeding admin user

Closes gitlab-development-kit#335

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

CE upstream - 2018-04-10 15:35 UTC

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

[Rails5] Fix running spinach tests

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

Previously whenever you'd schedule a chatops command we'd respond with
the message "The command has been scheduled!" which was a link to the
new build. Such messages can get annoying very quickly.

Fortunately there's a trick we can use: when you send back an empty
message Slack won't show said message, but it _will_ show the input
command.