IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "DEV: upgrade to Rails 6.0.3""

Browse Source 
This reverts commit 2ff8b4f5d9.

Attempt #2 at a Rails update this time we also update the
rails_multisite gem to allow for cleaner reordering
This commit is contained in:
Sam Saffron
2020-05-08 10:44:51 +10:00
parent efd0e4d02b
commit 609e929186
4 changed files with 47 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
config/initializers/200-first_middlewares.rb
View File

@@ -6,12 +6,8 @@
#
# We aren't manipulating the middleware stack directly because of
# https://github.com/rails/rails/pull/27936
session_operations = Rails::Configuration::MiddlewareStackProxy.new([
[:delete, MessageBus::Rack::Middleware],
[:unshift, MessageBus::Rack::Middleware],
])
Rails.configuration.middleware = Rails.configuration.middleware + session_operations
Rails.configuration.middleware.unshift(MessageBus::Rack::Middleware)
# no reason to track this in development, that is 300+ redis calls saved per
# page view (we serve all assets out of thin in development)
@@ -25,12 +21,7 @@ if Rails.env != 'development' || ENV['TRACK_REQUESTS']
end
if Rails.configuration.multisite
# Multisite needs to be first, because the request tracker and message bus
# rely on it
session_operations = Rails::Configuration::MiddlewareStackProxy.new([
[:delete, RailsMultisite::Middleware],
[:unshift, [RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config]],
])
Rails.configuration.middleware = Rails.configuration.middleware + session_operations
# Multisite needs to be first, because the request tracker and message bus rely on it
Rails.configuration.middleware.unshift RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config
Rails.configuration.middleware.delete ActionDispatch::Executor
end