diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-07-13 18:19:07 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-13 18:19:07 -0300 |
| commit | 853a041d5eab1afc8f08e7bb8bf6425cca95f6d3 (patch) | |
| tree | 552f219da7b2612e68872b46bdeaf5f8ef8c6f5e /actionpack/lib/action_controller/metal/etag_with_template_digest.rb | |
| parent | 85925931fb3b5dddc8163a5c7c98a752b962beb5 (diff) | |
| parent | 03efd177a1465f3be28d4da653f41839359eda49 (diff) | |
| download | rails-853a041d5eab1afc8f08e7bb8bf6425cca95f6d3.tar.gz rails-853a041d5eab1afc8f08e7bb8bf6425cca95f6d3.tar.bz2 rails-853a041d5eab1afc8f08e7bb8bf6425cca95f6d3.zip | |
Merge pull request #25817 from javan/fix-namespaced-implicit-render-etag-template-digest
Fix adding implicitly rendered namespaced template digests to ETags
Diffstat (limited to 'actionpack/lib/action_controller/metal/etag_with_template_digest.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/etag_with_template_digest.rb | 2 |
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 75ac996793..e3a7c3b166 100644 --- a/actionpack/lib/action_controller/metal/etag_with_template_digest.rb +++ b/actionpack/lib/action_controller/metal/etag_with_template_digest.rb @@ -45,7 +45,7 @@ module ActionController # template digest from the ETag. def pick_template_for_etag(options) unless options[:template] == false - options[:template] || "#{controller_name}/#{action_name}" + options[:template] || "#{controller_path}/#{action_name}" end end |