# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
#	app/assets/stylesheets/framework/mixins.scss
#	app/controllers/projects_controller.rb
#	db/schema.rb
#	spec/lib/gitlab/import_export/all_models.yml

[ci skip]

CE upstream - 2018-07-06 18:22 UTC

Closes gitlab-qa#146

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

Redesign for mr widget info and pipelines section

Closes #46795

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

EE- redesign mr widget info pipeline

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

Resolve "GitLab Project export should use object storage"

Closes #46246

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

[EE] Resolve "GitLab Project export should use object storage"

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

remove extra tick for eks docs

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

Use proper markdown rendering for previews

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

EE: Use proper markdown rendering for previews

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

Add GPL Commitment language

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

# 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