# Conflicts:
#	app/assets/javascripts/api.js
#	app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
#	app/finders/license_template_finder.rb
#	app/finders/template_finder.rb
#	app/models/commit_status.rb
#	app/models/issue.rb
#	app/models/note.rb
#	app/models/system_note_metadata.rb
#	app/services/ci/process_build_service.rb
#	db/schema.rb
#	doc/api/README.md
#	spec/features/projects/jobs_spec.rb
#	spec/models/issue_spec.rb

[ci skip]

Update operations metrics empty state

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

Fix LFS uploaded images not being rendered

Closes #50617

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

EE Backport: enable Geo Status widget in admin/projects

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

In EE it will render a Geo Status widget when Geo is enabled and it is
in a secondary node.

Also added minimal specs to that action.

Additional feature flag check for EE::Project

Closes #7894

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

Add timed incremental rollout to Auto DevOps

Closes gitlab-ee#7545

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

Auto DevOps deployment strategies now supports timed incremental
rollout. We are deprecating the usage of INCREMENTAL_ROLLOUT_ENABLED
environment variable in Auto DevOps template.

The new behavior will be driven by the INCREMENTAL_ROLLOUT_MODE variable
that can either be manual (same as INCREMENTAL_ROLLOUT_ENABLED) or
timed.

Rollout deployments will be executed using a 5 minute delay between each
job.

[broken master] Fix time dependent jobs spec

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

Resolve "Controller Projects::MergeRequestsController#ci_environments_status.json executes more than 100 SQL queries"

Closes #43109

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

Fix documentation for variables

Closes #51814

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

Merge branch 'ee-7453_document_security_and_licence_management_features_permissions-docs' into 'master'

Ee 7453 document security and licence management features permissions docs

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

Merge branch '7453_document_security_and_licence_management_features_permissions-docs' into 'master'

Document Security and Licence Management features permissions

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

Update the license docs

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

Batch comments on merge requests

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

CE upstream - 2018-10-05 12:21 UTC

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

Resolve "Show alert thresholds on dashboard"

Closes #6036

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

[master] Confidential issue/private snippet titles can be read by unauthenticated user through GFM markdown API

Closes #2706

See merge request gitlab/gitlabhq!2507

[master] Fix leaking private project namespace

Closes gitlabhq#2708

See merge request gitlab/gitlab-ee!672

Merge branch '50359-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master'

Resolve "ActiveRecord::StatementInvalid: PG::QueryCanceled: ERROR:  canceling statement due to statement timeout"

Closes #50359

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

[master] Fix leaking private project namespace

Closes #2708

See merge request gitlab/gitlabhq!2529

[security - master] Filter user sensitive data from discussions JSON

See merge request gitlab/gitlabhq!2536

Move related branches to service

Closes #43097

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

EE-port Move issue related_branches to service

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

Add a new project-specific templates API endpoint

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

Add a new project-specific templates API endpoint (EE)

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

Rails5: fix artifacts controller download spec

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

Geo: Added `All` tab in Geo Nodes > Projects

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