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 | |
| 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')
| -rw-r--r-- | actionpack/lib/action_view/helpers/benchmark_helper.rb | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/actionpack/lib/action_view/helpers/benchmark_helper.rb b/actionpack/lib/action_view/helpers/benchmark_helper.rb deleted file mode 100644 index 87fbf8f1a8..0000000000 --- a/actionpack/lib/action_view/helpers/benchmark_helper.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'active_support/benchmarkable' - -module ActionView - module Helpers - module BenchmarkHelper #:nodoc: - include ActiveSupport::Benchmarkable - - def benchmark(*) - capture { super } - end - end - end -end |