# 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

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

* master: (74 commits)
  Add changelog for 2fa filter in users api
  Add 2FA filter to users API for admins only
  Fix project creation for user endpoint bug
  Flowdock uses Gitaly, not Grit
  Add missing changelog type to docs
  Removes 'no job log' from trace action
  Fix missing namespace for some internal users
  Dedupe yarn dependencies
  Downgrade MySQL CI service from 8.0 to 5.7
  Atomic internal ids for all models
  Add documentation on how to configure Redis Sentinel by persistent class
  Update CHANGELOG.md for 10.7.0
  Update index.md
  Resolve "Text from the diff is showing within a table header inside the discussion after the discussion is resolved"
  Ignore ordering in IssueDueSchedulerWorker spec
  Don't include lfs_file_locks data in export bundle
  Documentation: Frontend Building Checklist
  Fix a documentation typo for GitLab pages
  Refactored activity calendar
  Add an API endpoint to download git repository snapshots
  ...

CE Backport: Reveal labels dropdown when labels icon is clicked on collapsed Epic sidebar

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

Resolve "Upgrading to API V4 Project Creation for user Fails"

Closes #45576

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

Add missing changelog type to docs

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

Add 2FA filter to users API for admins only

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

Add 2FA filter to users API for admins only

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

Merge branch '45571-red-master-issuedueschedulerworker-perform-schedules-one-mailscheduler-issuedueworker-per-project-with-open-issues-due-tomorrow' into 'master'

Resolve "Red master: IssueDueSchedulerWorker#perform schedules one MailScheduler::IssueDueWorker per project with open issues due tomorrow"

Closes #45571

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

Flowdock uses Gitaly, not Grit

Closes gitaly#1113

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

Merge branch 'rd-44635-error-500-when-clicking-ghost-user-or-gitlab-support-bot-in-ui' into 'master'

Fix missing namespace for some internal users

Closes #44635

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

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

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

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

Remove Web IDE feature flag from docs

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

In this endpoint the `jobs_enabled` parameter must be
translated to `builds_enabled` before being passed to
the `Projects::CreateService`.

Prior to this change, Flowdock used Grit to get the difference between
commits and post that to the remote service. This required direct path
access, which doesn't work with Gitaly.

Fixes gitlab-org/gitaly#1113

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