aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-04-27 13:56:14 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2016-04-27 13:56:14 +0200
commitabff83e60e9d91975b4788ef9cca388ab2536c10 (patch)
treeb5c2aa2c05b21d7c26bdc00af6c963aadbfe8b4a
parent791bdf6fb350b5cb272e4277c1b2b3d04beb7a35 (diff)
parent4266a61285776ecef87706adf91ceed8b7d7cfbb (diff)
downloadrails-abff83e60e9d91975b4788ef9cca388ab2536c10.tar.gz
rails-abff83e60e9d91975b4788ef9cca388ab2536c10.tar.bz2
rails-abff83e60e9d91975b4788ef9cca388ab2536c10.zip
Merge pull request #24752 from lsylvester/collection_caching-after-set_configs
Ensure action_controller.cache_store is set up before configuring the collection_cache
-rw-r--r--actionview/lib/action_view/railtie.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/railtie.rb b/actionview/lib/action_view/railtie.rb
index df14ae09f4..67c80d22d8 100644
--- a/actionview/lib/action_view/railtie.rb
+++ b/actionview/lib/action_view/railtie.rb
@@ -37,7 +37,7 @@ module ActionView
end
end
- initializer "action_view.collection_caching" do |app|
+ initializer "action_view.collection_caching", after: "action_controller.set_configs" do |app|
ActiveSupport.on_load(:action_controller) do
PartialRenderer.collection_cache = app.config.action_controller.cache_store
end