# Conflicts:
#	spec/lib/gitlab/database_spec.rb

[ci skip]

Add ExclusiveLease guards for RepositoryCheck::{DispatchWorker,BatchWorker}

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

updates version for CI_JOB_URL and CI_PIPELINE_URL to 11.1

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

Make it clear that we need to enable omniauth for SAML and Bitbucket

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

CE: Move mailer preview to app directory

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

Move mailer preview to app directory

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

We saw in production that DispatchWorker was running about twice an hour,
which would schedule twice as many jobs as it should.

For some reason, BatchWorker was running 1000 times per hour, possibly
due to Sidekiq RSS kills that caused these jobs to restart.

Adding an ExclusiveLease prevents these jobs from running more
than they should.

Relates to https://gitlab.com/gitlab-com/infrastructure/issues/4526

Show latest security reports at project level

Closes #6165

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

Ability to check if underlying database is read only

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

CE upstream - 2018-07-06 12:21 UTC

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

Remove silly use of repo disk path

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

Redesign the contribution analytics graphs

Closes #6089

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

Add Repository#set_config and #delete_config

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

Updated /products links to /pricing, CE to EE port

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

Add a new scenario to test GitHub import

Closes gitlab-qa#146

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

Delete deprecated object_storage_upload queue

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

Improves MR refactor getters and state and adds specs

Closes #48937

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

Update GitLab Pages to v1.0.0

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

(Part 2) Resolve "Recognise when a user is trying to validate a private SSH key"

Closes #46396

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

EE port of gitlab-ce!19997

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

Revert "Merge branch 'rosulk-patch-12' into 'master'"

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

# Conflicts:
#   db/schema.rb

[EE] Add a new scenario to test GitHub import

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

[EE] Delete deprecated object_storage_upload queue

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

Resolve "Add dropdown to Groups link in top bar"

Closes #36234

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

port 36234-nav-add-groups-dropdown to EE

Closes gitlab-ce#36234

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