# Conflicts:
#	app/models/project_feature.rb
#	db/schema.rb

[ci skip]

Resolve "Broadcast message is misaligned on sign in page"

Closes #49364

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

Geo: Improve Geo Status API performance with cached counters in SiteStatistic

Closes #6064

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

[CE Backport] Geo: Cache projects_count and wikis_count in SiteStatistic

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

CE upstream - 2018-07-25 15:24 UTC

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

fixes #47716 where email confirmation fails after adding additional emails

Closes #47716

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

Add rbtrace to Gemfile

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

Resolve "Move EE JavaScript tests to their own respective directory"

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

# Conflicts:
#	db/migrate/20180503193542_add_indexes_to_remote_mirror.rb

[ci skip]

CE upstream - 2018-07-25 12:22 UTC

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

Enable rubocop for db/**/* and ee/db/**/*

Closes #49582

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

EE: Enable rubocop for db/**/* and ee/db/**/*

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

# 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

This will be enabled if ENABLE_RBTRACE environment variable is defined.
This will allow us to debug all sorts of issues in production:

https://github.com/tmm1/rbtrace

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

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

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