Fix dependency scanning report with vulnerability without CVE

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

Revert "Use less aggressive sticking for DB load balancing"

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

Move API group deletion to Sidekiq

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

This reverts merge request !5732

CE upstream - 2018-05-17 18:26 UTC

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

Fixed illustration alignment for group milestones promotion

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

EE port: NestingDepth (level 5) in pages/pipelines.scss

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

# Conflicts:
#	app/assets/javascripts/pipelines/components/graph/graph_component.vue
#	app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
#	app/services/keys/destroy_service.rb

[ci skip]

Resolve "Estimating a large amount results in a server error 500"

Closes #46193

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

Resolve "Dropdown actions in mini pipeline graph in mr widget don't work"

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

Resolve "Dropdown actions in mini pipeline graph in mr widget don't work"

Closes #46381

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

Fix: Use case in-sensitive ordering by name for groups

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

CE upstream - 2018-05-17 14:52 UTC

Closes gitaly#1196

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

[CE]  Resolve "Extract EE specific files/lines for some controllers"

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

Resolve "Extract EE specific files/lines for some controllers"

Closes #6020

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

# Conflicts:
#	app/controllers/confirmations_controller.rb
#	app/controllers/registrations_controller.rb
#	scripts/utils.sh

[ci skip]

* master: (40 commits)
  Add changelog
  Update quick_start_guide.md
  Resolve "Opening Project with invite but without accepting leads to 404 error page"
  Respect the inheritance chain between Ci::Build and CommitStatus
  Remove unneccessary imports
  fixed copy to cliboard button in embedded snippets
  Fix Error 500 viewing admin page due to statement timeouts
  Grant privileges after database is created
  Only setup db in the first checkout!
  Project Sidebar: Split CI/CD into CI/CD and Operations
  Fix GPM content types for Doorkeeper
  Workhorse to send raw diff and patch for commits
  Refactor out duplication in runner_policy.rb
  Remove unnecessary runner.is_shared? checks in api because they are handled by policy
  Allow admin to assign shared runner to project through API
  Change policy list_runner_jobs -> read_runner
  Rename User#ci_authorized_runners -> ci_owned_runners
  Improve efficiency of authorized_runner policy query
  Use can? policies for lib/api/runners.rb
  Allow group runners to be viewed/edited in API
  ...

Improve performance of Projects::PipelinesController#index

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

* master: (40 commits)
  Add changelog
  Update quick_start_guide.md
  Resolve "Opening Project with invite but without accepting leads to 404 error page"
  Respect the inheritance chain between Ci::Build and CommitStatus
  Remove unneccessary imports
  fixed copy to cliboard button in embedded snippets
  Fix Error 500 viewing admin page due to statement timeouts
  Grant privileges after database is created
  Only setup db in the first checkout!
  Project Sidebar: Split CI/CD into CI/CD and Operations
  Fix GPM content types for Doorkeeper
  Workhorse to send raw diff and patch for commits
  Refactor out duplication in runner_policy.rb
  Remove unnecessary runner.is_shared? checks in api because they are handled by policy
  Allow admin to assign shared runner to project through API
  Change policy list_runner_jobs -> read_runner
  Rename User#ci_authorized_runners -> ci_owned_runners
  Improve efficiency of authorized_runner policy query
  Use can? policies for lib/api/runners.rb
  Allow group runners to be viewed/edited in API
  ...

Resolve "NoMethodError: undefined method `present' for #<GenericCommitStatus:0x00007f6eacf34a40>"

Closes #46177

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

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

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

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

Merge branch 'docs/46042-document-that-project-templates-can-be-used-with-auto-devops' into 'master'

Resolve "Document that Project Templates can be used with Auto DevOps"

Closes #46042

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

When displaying a project's pipelines
(Projects::PipelinesController#index) we now exclude the coverage data.
This data was not used by the frontend, yet getting it would require one
SQL query per pipeline. These queries in turn could be quite expensive
on GitLab.com.

When displaying the pipelines of a project we now preload the following
data:

1. Authors of the commits that belong to these pipelines
2. The number of warnings per pipeline, which is used by
   Ci::Pipeline#has_warnings?

== Commit Authors

Previously this data was queried for every Commit separately, leading to
20 SQL queries being executed in the worst case. With an average of 3 to
5 milliseconds per SQL query this could result in 100 milliseconds being
spent in _just_ getting Commit authors.

To preload this data Commit#author now uses BatchLoader (through
Commit#lazy_author), and a separate module
Gitlab::Ci::Pipeline::Preloader is used to ensure all authors are loaded
before they are used.

== Number of warnings

This changes Ci::Pipeline#has_warnings? so it supports preloading of the
number of warnings per pipeline. This removes the need for executing a
COUNT(*) query for every pipeline just to see if it has any warnings or
not.