aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-05-13 18:35:35 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-05-13 18:35:36 -0300
commitecfb32cd165c0763befb7eed7e348438db928cef (patch)
treeab2507945fd7880090973766b4858adc743581dc /activesupport
parent60de8010609ac7ac78fc19fa60b4d5805b4e511f (diff)
downloadrails-ecfb32cd165c0763befb7eed7e348438db928cef.tar.gz
rails-ecfb32cd165c0763befb7eed7e348438db928cef.tar.bz2
rails-ecfb32cd165c0763befb7eed7e348438db928cef.zip
Remove dependency on safe_join from number helpers
Introduced in 0f848dd54911f0e15c5c3aceabf09582cc6eab16.
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/testing/performance.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index 5048c4a0d0..ec6986654e 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -126,7 +126,7 @@ module ActiveSupport
def record; end
end
- class Benchmarker < Performer
+ class Benchmarker < Performer
def initialize(*args)
super
@supported = @metric.respond_to?('measure')
@@ -196,7 +196,6 @@ module ActiveSupport
class Base
include ActionView::Helpers::NumberHelper
- include ActionView::Helpers::OutputSafetyHelper
attr_reader :total
@@ -208,7 +207,7 @@ module ActiveSupport
@name ||= self.class.name.demodulize.underscore
end
- def benchmark
+ def benchmark
with_gc_stats do
before = measure
yield