Resolve "`sha-mismatch` vue component is rendering an empty block"

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

Add feature check to Lock button

Closes #5952

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

Port of gitlab-ce!18867

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

Skip transaction check for seeding burndown charts

Closes gitlab-development-kit#351

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

The seed-fu gem wraps all seeds in a transaction:
https://github.com/mbleigh/seed-fu/blob/34c054c914858c3d7685f83d16dea5c0e2114561/lib/seed-fu/runner.rb#L35.
We can skip the Sidekiq transaction check for seeding test fixtures.

Closes https://gitlab.com/gitlab-org/gitlab-development-kit/issues/351

CE upstream - 2018-05-11 18:29 UTC

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

# Conflicts:
#	features/steps/shared/authentication.rb

[ci skip]

Remove duplicate method

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

Remove duplicate method

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

Allow a user to sign out when on the terms page

Closes #46211

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

Merge branch '4957-projectsyncworker-should-skip-projects-that-have-a-broken-gitaly-shard-2' into 'master'

Only process Geo::EventLog events if associated shard is queryable and healthy

Closes #4957

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

Resolve "[Rails5] Fix spec/controllers/projects/jobs_controller_spec.rb"

Closes #46227

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

Replace the `project/merge_requests/references.feature` spinach test with an rspec analog

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

Merge branch 'blackst0ne-replace-spinach-project-merge-requests-references.feature-ee' into 'master'

EE port of gitlab-ce!18794

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

CE upstream - 2018-05-11 15:29 UTC

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

Geo: When a repository or Wiki has failed, mark resync flag as true

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

Exclude specific EE checks from docs branches

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

# Conflicts:
#	lib/gitlab/git_access.rb
#	spec/lib/gitlab/git_access_spec.rb

[ci skip]

Merge branch 'docs-fixed-typo-microsoft-teams-slug' into 'master'

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

Fix: API Documentation typo on Microsoft Teams slug

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

Fix: API Documentation typo on Microsoft Teams slug

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

Enforce terms acceptance before configuring 2FA

Closes #46256

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

[EE] Block access to API & git when terms are enforced

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

Block access to API & git when terms are enforced

Closes #45849

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

Vendor Auto DevOps template

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

Resolve "Remove modal box confirmation when retrying a pipeline"

Closes #45715

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

CE upstream - 2018-05-11 12:30 UTC

Closes gitaly#894

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