aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorAaron Patterson <tenderlove@github.com>2019-02-19 13:45:30 -0800
committerGitHub <noreply@github.com>2019-02-19 13:45:30 -0800
commitff6b713f5e729859995f204093ad3f8e08f39ea8 (patch)
tree2729530ac520a01230e9a632fde5d549e140a5e7 /actionpack/lib
parent16a8072e2db29d5ec895830dca995f99ce1915d6 (diff)
parentdf12a1b2413906ee38a977e3cbb325512c184837 (diff)
downloadrails-ff6b713f5e729859995f204093ad3f8e08f39ea8.tar.gz
rails-ff6b713f5e729859995f204093ad3f8e08f39ea8.tar.bz2
rails-ff6b713f5e729859995f204093ad3f8e08f39ea8.zip
Merge pull request #35293 from rails/remove-rendered-format-from-cache
Pass the template format to the digestor
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/metal/etag_with_template_digest.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/etag_with_template_digest.rb b/actionpack/lib/action_controller/metal/etag_with_template_digest.rb
index 640c75536e..2f1544c69c 100644
--- a/actionpack/lib/action_controller/metal/etag_with_template_digest.rb
+++ b/actionpack/lib/action_controller/metal/etag_with_template_digest.rb
@@ -51,7 +51,7 @@ module ActionController
end
def lookup_and_digest_template(template)
- ActionView::Digestor.digest name: template, finder: lookup_context
+ ActionView::Digestor.digest name: template, format: nil, finder: lookup_context
end
end
end