aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/template.rb
diff options
context:
space:
mode:
authorJustin Coyne <justin@curationexperts.com>2013-02-27 09:44:25 -0600
committerJustin Coyne <justin@curationexperts.com>2013-03-01 07:22:38 -0600
commit73deb3af23765882f67869afb4eaa8ad74a351d1 (patch)
tree846c47334e3ba2e9aabb6bc9c396841b4ed65776 /actionpack/lib/action_view/template.rb
parentb49a2a779ba6deba108d1f842ab5b7bc7460aa14 (diff)
downloadrails-73deb3af23765882f67869afb4eaa8ad74a351d1.tar.gz
rails-73deb3af23765882f67869afb4eaa8ad74a351d1.tar.bz2
rails-73deb3af23765882f67869afb4eaa8ad74a351d1.zip
Allow use of assert_template with the :file option.
This worked in Rails 3.2, but was a regression in 4.0.0.beta1
Diffstat (limited to 'actionpack/lib/action_view/template.rb')
-rw-r--r--actionpack/lib/action_view/template.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index f73d14c79b..f5744aa6d4 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -138,7 +138,7 @@ module ActionView
# we use a bang in this instrumentation because you don't want to
# consume this in production. This is only slow if it's being listened to.
def render(view, locals, buffer=nil, &block)
- ActiveSupport::Notifications.instrument("!render_template.action_view", :virtual_path => @virtual_path) do
+ ActiveSupport::Notifications.instrument("!render_template.action_view", :virtual_path => @virtual_path, :identifier=>@identifier) do
compile!(view)
view.send(method_name, locals, buffer, &block)
end