aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2017-02-20 02:39:43 +1030
committerGitHub <noreply@github.com>2017-02-20 02:39:43 +1030
commit978e097375c17bf694374792b5f33b5fc6c9f4b5 (patch)
tree63b56090f1beac29cb5e0745b685ce5c60020694
parente51572dce00c5f011f019397984ed8e82d94fc84 (diff)
parentc61488b4adf987979e229ebcfb3ed78814efd32a (diff)
downloadrails-978e097375c17bf694374792b5f33b5fc6c9f4b5.tar.gz
rails-978e097375c17bf694374792b5f33b5fc6c9f4b5.tar.bz2
rails-978e097375c17bf694374792b5f33b5fc6c9f4b5.zip
Merge pull request #28069 from st0012/change-back-frozen-string
Unfreeze interpolated string because it's unnecessary.
-rw-r--r--actionpack/lib/abstract_controller/caching/fragments.rb2
-rw-r--r--actionview/lib/action_view/template.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/caching/fragments.rb b/actionpack/lib/abstract_controller/caching/fragments.rb
index 13fa2b393d..c85b4adba1 100644
--- a/actionpack/lib/abstract_controller/caching/fragments.rb
+++ b/actionpack/lib/abstract_controller/caching/fragments.rb
@@ -136,7 +136,7 @@ module AbstractController
def instrument_fragment_cache(name, key) # :nodoc:
payload = instrument_payload(key)
- ActiveSupport::Notifications.instrument("#{name}.#{instrument_name}".freeze, payload) { yield }
+ ActiveSupport::Notifications.instrument("#{name}.#{instrument_name}", payload) { yield }
end
end
end
diff --git a/actionview/lib/action_view/template.rb b/actionview/lib/action_view/template.rb
index c067031d2d..b0e2f1e54e 100644
--- a/actionview/lib/action_view/template.rb
+++ b/actionview/lib/action_view/template.rb
@@ -345,7 +345,7 @@ module ActionView
end
def instrument(action, &block) # :doc:
- ActiveSupport::Notifications.instrument("#{action}.action_view".freeze, instrument_payload, &block)
+ ActiveSupport::Notifications.instrument("#{action}.action_view", instrument_payload, &block)
end
def instrument_render_template(&block)