# Conflicts:
#	Gemfile.rails5.lock
#	app/policies/concerns/policy_actor.rb
#	app/serializers/pipeline_serializer.rb
#	spec/javascripts/pipelines/graph/graph_component_spec.js
#	spec/javascripts/pipelines/graph/stage_column_component_spec.js
#	spec/serializers/pipeline_serializer_spec.rb

[ci skip]

Resolve "Red master: can't modify frozen String in app/views/projects/jobs/_sidebar.html.haml"

Closes #49681

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

Resolve "Unable to load 'lib/gitlab/kubernetes/helm'"

Closes #7027

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

[ci skip]

[ci skip]

[ci skip]

Merge branch '6877-geo-the-storage-config-in-the-other-section-is-broken-in-the-geo-nodes-admin-page' into 'master'

Resolve "Geo - The "Storage config" in the "Other section" is broken in the Geo nodes admin page"

Closes #6877 and #4851

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

Docs: add Starter badge to Jenkins integration

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

Update gitlab-shell version to 7.2.0

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

Put fallback reply-key address first in the References header

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

Stop building Route rows on the fly

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

EE: Stop building Route rows on the fly

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

The References header is an ordered list of mails, and some clients
only look at the last mail in the list to determine to which mail the
mail is in reply to.

Therefore, to be a less obtrusive as possible, put the fallback
address first.

Some info about the reply key lookup in the References header:
https://docs.gitlab.com/ee/administration/reply_by_email.html#how-it-works

This reverts merge request !20679

Resolve "Making instance-wide data tools more accessible"

Closes #41416 and #48507

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

CE: Add PolicyCheckable concern for things passing to policy check

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

Add PolicyCheckable concern for things passing to policy check

Closes #7000

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

if all methods are also presented in the user.

if all methods are also presented in the user.

It's sad that sanitizing is updating the string directly.

Resolve "The comparison list for the modified icons"

Closes #48567

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

EE-Port of gitlab-ce!20501

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

More Gitaly cleanup: fetch_ref, allow disk access blocks

Closes gitaly#1295

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