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

Add 2FA filter to users API for admins only

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

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

Remove Web IDE feature flag from docs

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

CE upstream - 2018-04-22 18:22 UTC

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

Removes  'Job log message' from build trace

Closes #45625

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

'No job log' message is no longer necessary since we returned an image
when a build does not have a trace. See
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18278 for more
details

Closes #45625

CE upstream - 2018-04-20 21:24 UTC

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

"Geo: schedule a git repack after initial clone"

Closes #5181

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

# Conflicts:
#	app/models/milestone.rb
#	db/schema.rb

[ci skip]

Warn admin access level may be removed from protected branch levels

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

Resolve "Document background verification"

Closes #5697

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

CE upstream - 2018-04-20 12:24 UTC

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

Dedupe yarn dependencies

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

EE port of "dedupe yarn dependencies"

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

Downgrade MySQL CI service from 8.0 to 5.7

Closes #45606

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

Downgrade MySQL CI service from 8.0 to 5.7

Closes #45606

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

add restart of gitlab-pages to apply gitlab pages settings

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

[ci skip]

MySQL 8.0 made the default authentication mode `caching_sha2_password`, and
this breaks our CI builds at the moment. Downgrade until we can figure
out how to support this.

Closes #45606

Resolve "Disaster Recovery doc: Promoted node -> Primary with Geo enabled is not clear"

Closes #5722

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

Atomic internal ids for all models

Closes #44259

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

EE-port for "Atomic internal ids for all models"

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