Merge branch 'master' of git://github.com/lifo/docrails

Conflicts:
	activerecord/RUNNING_UNIT_TESTS

1 files changed, 3 insertions, 3 deletions

diff --git a/railties/lib/rails/commands/benchmarker.rb b/railties/lib/rails/commands/benchmarker.rb
index b06c915ac3..6c52d0f70f 100644
--- a/railties/lib/rails/commands/benchmarker.rb
+++ b/railties/lib/rails/commands/benchmarker.rb
@@ -9,7 +9,7 @@ ARGV.pop
 def options
   options = {}
   defaults = ActiveSupport::Testing::Performance::DEFAULTS
-  
+
   OptionParser.new do |opt|
     opt.banner = "Usage: rails benchmarker 'Ruby.code' 'Ruby.more_code' ... [OPTS]"
     opt.on('-r', '--runs N', Numeric, 'Number of runs.', "Default: #{defaults[:runs]}") { |r| options[:runs] = r }
@@ -17,13 +17,13 @@ def options
     opt.on('-m', '--metrics a,b,c', Array, 'Metrics to use.', "Default: #{defaults[:metrics].join(",")}") { |m| options[:metrics] = m.map(&:to_sym) }
     opt.parse!(ARGV)
   end
-  
+
   options
 end
 
 class BenchmarkerTest < ActionDispatch::PerformanceTest
   self.profile_options = options
-  
+
   ARGV.each do |expression|
     eval <<-RUBY
       def test_#{expression.parameterize('_')}