diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-10-05 05:23:48 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-05 05:23:48 +1030 |
| commit | 4d6feef79248a63c4cefde3f9ceb2242925e8d8d (patch) | |
| tree | 83724eea7492b2ad61638c0bfa41c9b6411a3ad4 /actionview/lib | |
| parent | 6ecb14715e4d5acb06c282b96b795404e25c7a11 (diff) | |
| parent | e8b36e7711d44bf23a39426b3d766c08528573b3 (diff) | |
| download | rails-4d6feef79248a63c4cefde3f9ceb2242925e8d8d.tar.gz rails-4d6feef79248a63c4cefde3f9ceb2242925e8d8d.tar.bz2 rails-4d6feef79248a63c4cefde3f9ceb2242925e8d8d.zip | |
Merge pull request #26684 from matthewd/executor-serial
Avoid bumping the class serial when invoking executor
Diffstat (limited to 'actionview/lib')
| -rw-r--r-- | actionview/lib/action_view/digestor.rb | 6 | ||||
| -rw-r--r-- | actionview/lib/action_view/railtie.rb | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/actionview/lib/action_view/digestor.rb b/actionview/lib/action_view/digestor.rb index 2d6ad8f6d9..0658d8601d 100644 --- a/actionview/lib/action_view/digestor.rb +++ b/actionview/lib/action_view/digestor.rb @@ -6,6 +6,12 @@ module ActionView class Digestor @@digest_mutex = Mutex.new + module PerExecutionDigestCacheExpiry + def self.before(target) + ActionView::LookupContext::DetailsKey.clear + end + end + class << self # Supported options: # diff --git a/actionview/lib/action_view/railtie.rb b/actionview/lib/action_view/railtie.rb index dfb99f4ea9..42795ca2c7 100644 --- a/actionview/lib/action_view/railtie.rb +++ b/actionview/lib/action_view/railtie.rb @@ -40,7 +40,7 @@ module ActionView initializer "action_view.per_request_digest_cache" do |app| ActiveSupport.on_load(:action_view) do if app.config.consider_all_requests_local - app.executor.to_run { ActionView::LookupContext::DetailsKey.clear } + app.executor.to_run ActionView::Digestor::PerExecutionDigestCacheExpiry end end end |