diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-01-14 10:24:43 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2013-01-14 10:24:43 -0700 |
| commit | bf095770e561c51cebeb5a556afc03a21d9e603c (patch) | |
| tree | 27d13bf00a168aea8663eb151096c4a9bbe79eb7 /actionpack/lib/action_view/helpers.rb | |
| parent | 0246712bc15201ea1e8285af5adc5b2620538b5d (diff) | |
| download | rails-bf095770e561c51cebeb5a556afc03a21d9e603c.tar.gz rails-bf095770e561c51cebeb5a556afc03a21d9e603c.tar.bz2 rails-bf095770e561c51cebeb5a556afc03a21d9e603c.zip | |
Revert benchmark helper regression. Use a #capture within a #benchmark
block. Breaks benchmark calls that return non-String values otherwise.
Revert "add benchmark helper that works in erb"
This reverts commit 904e544cc8f5846de7c31827bb5556c6a238c0de.
Conflicts:
actionpack/lib/action_view/helpers.rb
actionpack/lib/action_view/helpers/benchmark_helper.rb
actionpack/test/template/benchmark_helper_test.rb
Diffstat (limited to 'actionpack/lib/action_view/helpers.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers.rb b/actionpack/lib/action_view/helpers.rb index 269e78a021..8a78685ae1 100644 --- a/actionpack/lib/action_view/helpers.rb +++ b/actionpack/lib/action_view/helpers.rb @@ -1,3 +1,5 @@ +require 'active_support/benchmarkable' + module ActionView #:nodoc: module Helpers #:nodoc: extend ActiveSupport::Autoload @@ -6,7 +8,6 @@ module ActionView #:nodoc: autoload :AssetTagHelper autoload :AssetUrlHelper autoload :AtomFeedHelper - autoload :BenchmarkHelper autoload :CacheHelper autoload :CaptureHelper autoload :ControllerHelper @@ -29,11 +30,11 @@ module ActionView #:nodoc: extend ActiveSupport::Concern + include ActiveSupport::Benchmarkable include ActiveModelHelper include AssetTagHelper include AssetUrlHelper include AtomFeedHelper - include BenchmarkHelper include CacheHelper include CaptureHelper include ControllerHelper |