aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-05-18 12:01:26 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-05-18 12:01:26 -0700
commita6dbc3fe7a504805572e634d39e37fd63ba7fd45 (patch)
treeb5ca003d51784280ee77889bd92de9001c8afe61 /activesupport/lib/active_support
parent476ef2df74e1fb3646780950a3be1af85aa43adc (diff)
parent2c423b3f3f0d489b0e9943b69f5b25d97006ca74 (diff)
downloadrails-a6dbc3fe7a504805572e634d39e37fd63ba7fd45.tar.gz
rails-a6dbc3fe7a504805572e634d39e37fd63ba7fd45.tar.bz2
rails-a6dbc3fe7a504805572e634d39e37fd63ba7fd45.zip
Merge pull request #6355 from amutz/fix_number_with_delimiter_escaping
NumberHelper.number_with_delimiter should html_escape both delimiters and separators
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/testing/performance.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index ec6986654e..2bea0f991a 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -196,6 +196,7 @@ module ActiveSupport
class Base
include ActionView::Helpers::NumberHelper
+ include ActionView::Helpers::OutputSafetyHelper
attr_reader :total