# Conflicts:
#	app/views/layouts/devise.html.haml
#	app/views/layouts/devise_empty.html.haml
#	app/views/layouts/mailer.text.erb
#	app/views/layouts/nav/sidebar/_admin.html.haml
#	app/views/layouts/nav/sidebar/_profile.html.haml
#	doc/api/users.md
#	locale/gitlab.pot

[ci skip]

Back port ReactiveCaching

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

doc: Configuring and initializing Helm Tiller

Closes #49025

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

Prefer using direct links in docs styleguide

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

Replace clipboard icon in Service Desk settings

Closes #6988

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

Adds rack attack disabled by default notice to documentation

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

Updates documentation to state that rack attack will be disabled by default…

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

Disable Rack Attack by default

Closes #40973

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

Replace snake case css classes

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

Updates documentation to state that rack attack will be disabled by default starting at version 11.2

Improve the 'review' job and make it manual

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

Enable frozen string in presenters and policies

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

i18n: externalize strings from 'app/views/layouts'

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

Bump html-pipeline to 2.8.4

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

Replace snake case in SCSS variables

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

Replace all snake case in scss variables

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

Use limit parameter to retrieve Wikis from Gitaly

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

Fix missing ` in users.md

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Replace author_link snake case in stylesheets, specs, and helpers

Closes #30921

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

Add frozen_string_literal to migration templates

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

Update doc/ci/docker/using_docker_build.md

Closes #48691

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

Part of #47424