[ci skip]

CE upstream - 2018-04-23 15:27 UTC

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

Fix missing Markdown link in background verification docs

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

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>

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

EE: Make sure we're not creating duplicated namespace

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

# Conflicts:
#	app/assets/javascripts/pipelines/components/graph/graph_component.vue
#	app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
#	lib/gitlab.rb
#	lib/settings.rb
#	spec/spec_helper.rb
#	spec/support/helpers/stub_configuration.rb

[ci skip]

[EE] Resolve "Skip setup of gitlab-shell, gitaly, ... for specs that don't need it."

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

Resolve "Skip setup of gitlab-shell, gitaly, ... for specs that don't need it."

Closes #44713

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

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

Closes gitaly#1113

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

Added missing note for P1 priority and updated links

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

fix revoke header on deploy token docs

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

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

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Remove UJS actions from pipeline graph

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

Remove UJS actions from pipeline graph

Closes #37837

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

# Conflicts:
#	app/assets/javascripts/vue_shared/components/ci_icon.vue
#	app/finders/users_finder.rb

[ci skip]

Prettify vue shared component & improve tests to match guidelines

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

Runs prettier on some vue shared components

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

Prettify vue shared component & improve tests to match guidelines

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

Provide props down instead of an event

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

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

Fix minor project import API doc typos

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

Moved committer and spec. Added some extra code to run hooks or not depending on the options

Closes #45594

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

Resolve "Make Auto DevOps settings first class"

Closes #43466

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

* master: (52 commits)
  Add 2FA filter to users API for admins only
  Remove Web IDE feature flag from docs
  Removes 'no job log' from trace action
  Resolve conflicts in app/models/milestone.rb
  Resolve conflicts in db/schema.rb
  "Geo: schedule a git repack after initial clone"
  It is stable since it works.
  Add docs for background verification
  Lock mysql image to 5.7 for `use-mysql-with-elasticsearch`
  Dedupe yarn dependencies
  Merge branch 'sh-downgrade-mysql-ci' into 'master'
  Fix conflict related to LfsFileLock block
  Resolve CHANGELOG.md by using CE's version
  Downgrade MySQL CI service from 8.0 to 5.7
  CE->EE: Fix conflicts relating to project snapshots
  Warn admin 60 may be removed from protected branch levels
  Fix conflict: app/assets/javascripts/boards/models/list.js
  Atomic internal ids for all models
  EE-port for "Atomic internal ids for all models"
  Fix conflicts in db/schema.rb
  ...