aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorAndrew Mutz <andrew.mutz@gmail.com>2012-05-16 13:22:52 -0700
committerAndrew Mutz <andrew.mutz@gmail.com>2012-05-18 11:56:18 -0700
commit2c423b3f3f0d489b0e9943b69f5b25d97006ca74 (patch)
treeb5ca003d51784280ee77889bd92de9001c8afe61 /activesupport/lib/active_support
parent476ef2df74e1fb3646780950a3be1af85aa43adc (diff)
downloadrails-2c423b3f3f0d489b0e9943b69f5b25d97006ca74.tar.gz
rails-2c423b3f3f0d489b0e9943b69f5b25d97006ca74.tar.bz2
rails-2c423b3f3f0d489b0e9943b69f5b25d97006ca74.zip
reverting decoupling of NumberHelper from safe_join and adding tests for escaping of 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