diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/commands/performance/profiler.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 0a3c34dbd7..864c618d63 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* script/performance/profiler compatibility with the ruby-prof >= 0.5.0. Closes #9176. [Catfish] + * Flesh out rake gems:unpack to unpack all gems, and add rake gems:build for native extensions. #11513 [ddollar] rake gems:unpack # unpacks all gems diff --git a/railties/lib/commands/performance/profiler.rb b/railties/lib/commands/performance/profiler.rb index 464cea344d..fd111bae87 100644 --- a/railties/lib/commands/performance/profiler.rb +++ b/railties/lib/commands/performance/profiler.rb @@ -19,7 +19,7 @@ begin begin require "ruby-prof" $stderr.puts 'Using the ruby-prof extension.' - RubyProf.clock_mode = RubyProf::WALL_TIME + RubyProf.measure_mode = RubyProf::WALL_TIME RubyProf.start profile_me results = RubyProf.stop |