1 files changed, 16 insertions, 10 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 669cf55bca..6c103bb042 100644
--- a/actionpack/lib/action_controller/metal/etag_with_template_digest.rb
+++ b/actionpack/lib/action_controller/metal/etag_with_template_digest.rb
@@ -33,18 +33,24 @@ module ActionController
     end
 
     private
-    def determine_template_etag(options)
-      if template = pick_template_for_etag(options)
-        lookup_and_digest_template(template)
+      def determine_template_etag(options)
+        if template = pick_template_for_etag(options)
+          lookup_and_digest_template(template)
+        end
       end
-    end
 
-    def pick_template_for_etag(options)
-      options.fetch(:template) { "#{controller_name}/#{action_name}" }
-    end
+      # Pick the template digest to include in the ETag. If the +:template+ option
+      # is present, use the named template. If +:template+ is nil or absent, use
+      # the default controller/action template. If +:template+ is false, omit the
+      # template digest from the ETag.
+      def pick_template_for_etag(options)
+        unless options[:template] == false
+          options[:template] || "#{controller_path}/#{action_name}"
+        end
+      end
 
-    def lookup_and_digest_template(template)
-      ActionView::Digestor.digest name: template, finder: lookup_context
-    end
+      def lookup_and_digest_template(template)
+        ActionView::Digestor.digest name: template, finder: lookup_context
+      end
   end
 end