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

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

This reverts merge request !17730

Replace vue resource with axios for pipelines table

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

Document process for new Git features

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

Use Gitaly 0.95.0

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

Fix conflicts for  app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue

Port Ruby 2.3.7 changes to EE

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

Change all in-product trial references from Premium/EE to Ultimate

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

Verify that deploy token has valid access when pulling container registry image

Closes #45148

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