This resolves a conflict and inconsistency with the EE version of
app/models/note.rb.

Bump Gitaly to v0.125.0

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

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

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

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.

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

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

Closes #2706

See merge request gitlab/gitlabhq!2507

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

Add a new project-specific templates API endpoint

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

Rails5: fix artifacts controller download spec

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

Revert "Merge branch 'deploy-tokens' into 'master'"

Closes #52228

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

Delayed jobs

Closes #51352

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

Backport changes from gitlab-ee!7538

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

Fixed merge request file tree not sticking on Safari

Closes #52277

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

Add installation type to backup information file

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

CE port Resolve "Promote starting a GitLab.com trial"

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

Merge branch '5699-enabling-disabling-features-does-not-propagate-correctly-to-geo-secondaries' into 'master'

Backport a refactor on the Feature.flipper method to CE

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

Add new CI predefined variables with version components

Closes #46050

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

Add gitlab-templates code owners

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