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

Closes #5444

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

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

[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.

Reduce complexity of issuable finder query.

Closes #37125

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

CE upstream - 2018-04-10 12:26 UTC

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

Update Security Products jobs definitions

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

Add a note about not supporting recursive includes on Ci YAML documentation

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

explain auto-devops better

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

[ci skip]

CE upstream - 2018-04-10 04:58 UTC

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

1. Add support for `RAILS5=1|true` for the `bin/spinach` command.
2. Synchronize used spinach versions both for rails4 and rails5.

For rails5 it was accidently used spinach 0.10.1 instead of 0.8.10.
That brought some problems on running spinach tests.

Example of failure message:

NoMethodError: undefined method `line' for #<Spinach::Scenario:0x000000000c86ba80>
Did you mean?  lines
  /builds/gitlab-org/gitlab-ce/features/support/env.rb:52:in `before_scenario_run'

Revert "Merge branch 'improve-jobs-queuing-time-metric' into 'master'"

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