# Conflicts:
#	.gitlab-ci.yml
#	app/helpers/groups_helper.rb
#	app/views/layouts/_page.html.haml
#	doc/ci/yaml/README.md
#	doc/topics/autodevops/index.md
#	locale/gitlab.pot

[ci skip]

Backport scss changes for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7973

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

clarify auto review apps deployment, jobs skipped by license, disabling at…

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

Autodevops docs update

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

CE upstream - 2018-10-23 15:21 UTC

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

Also count specs in new files in Danger check

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

Remove unused rails5-variables

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

EE: Remove unused rails5-variables

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

Limit flash notice width for fixed layout and improve spacing for fluid layout

Closes #32868

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

Limit flash notice width for fixed layout and improve spacing for fluid layout

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

Add transparent background to markdown header tabs

Closes #53105

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

Rails requires a second storage for testing cross shard features. Gitaly
will not boot if this second storage doesn't exist. So this will create
this storage without adding it to the list of storages that Rails knows
about.

Don't use `repository_storage: 'broken'`, but instead use the
`:broken_storage` trait.

They're no longer used and have no effect

Update maven docs

Closes #8032

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

Request to be a German proofreader

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

Remove tooltip on sidebar text buttons

Closes #8089

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

Update license_management job definition

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

Add list mode to file browser in diffs

Closes #51859

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

Hotfix for Rspec and second storage

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

Bump google-protobuf to 3.6.1

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

Rails requires a second storage for testing cross shard features. Gitaly
will not boot if this second storage doesn't exist. So this will create
this storage without adding it to the list of storages that Rails knows
about.

They're no longer used and have no effect

It looks like gRPC may have worked around
https://github.com/google/protobuf/issues/4210 via
https://github.com/grpc/grpc/pull/14634.

This is needed to support Ruby 2.5
(https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22555).

Sync group sidebar template with EE

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

Adds the security dashboard link

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

Add Security Reports logic

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