diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-03-24 17:15:10 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-03-24 17:15:10 +0530 |
| commit | 014498e1d74decd57d44d45c187fa4f4b968b811 (patch) | |
| tree | 948610d910d28fc976cdffffd533879a16b01557 /railties/lib | |
| parent | 780ab582091cf06ded9540a5d4fef23086e9bac3 (diff) | |
| parent | 2fab826db055f7b59bb83b834d730d69c8c7b25e (diff) | |
| download | rails-014498e1d74decd57d44d45c187fa4f4b968b811.tar.gz rails-014498e1d74decd57d44d45c187fa4f4b968b811.tar.bz2 rails-014498e1d74decd57d44d45c187fa4f4b968b811.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
guides/source/ruby_on_rails_guides_guidelines.textile
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb | 2 |
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 |