aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorCharles Brian Quinn <cbq@highgroove.com>2012-03-19 21:01:22 -0400
committerCharles Brian Quinn <cbq@highgroove.com>2012-03-19 21:01:22 -0400
commit884cb24afbef38600ae0c5ac3934b72ffd8d99a5 (patch)
tree3a9d71bd5ae946d3e89104cbee31fc7a8685e77e /railties
parentc291195a6d955dd11eb16f6363db3cb7d3ff3557 (diff)
parentb3d47993696848125dfd40215fbff4cce66d1271 (diff)
downloadrails-884cb24afbef38600ae0c5ac3934b72ffd8d99a5.tar.gz
rails-884cb24afbef38600ae0c5ac3934b72ffd8d99a5.tar.bz2
rails-884cb24afbef38600ae0c5ac3934b72ffd8d99a5.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb b/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb
index d296b26b16..370750a175 100644
--- a/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb
+++ b/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb
@@ -3,7 +3,7 @@ require 'rails/performance_test_help'
class <%= class_name %>Test < ActionDispatch::PerformanceTest
# Refer to the documentation for all available options
- # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
+ # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory],
# :output => 'tmp/performance', :formats => [:flat] }
def test_homepage