diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-09-11 09:17:38 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-09-11 09:17:38 +0000 |
| commit | 17250c91570d3ba20a4dbbe5746d4558f1a34c87 (patch) | |
| tree | c3c1b81abee6f583fd3d878ab949d9822c3e9542 | |
| parent | e234115b630d05c0868a60eca65142ff3137064f (diff) | |
| download | rails-17250c91570d3ba20a4dbbe5746d4558f1a34c87.tar.gz rails-17250c91570d3ba20a4dbbe5746d4558f1a34c87.tar.bz2 rails-17250c91570d3ba20a4dbbe5746d4558f1a34c87.zip | |
Fixed script/profiler for Ruby 1.8.2 #1863 [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2199 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/bin/profiler | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 27b4b6cab2..56588f4707 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed script/profiler for Ruby 1.8.2 #1863 [Rick Olson] + * Fixed clone_structure_to_test task for SQLite #1864 [jon@burningbush.us] * Added -m/--mime-types option to the WEBrick server, so you can specify a Apache-style mime.types file to load #2059 [ask@develooper.com] diff --git a/railties/bin/profiler b/railties/bin/profiler index d8927a1c49..d84c8b739f 100644 --- a/railties/bin/profiler +++ b/railties/bin/profiler @@ -26,6 +26,7 @@ begin require 'rubyprof_ext' Prof.print_profile(results, $stderr) rescue LoadError + require 'profiler' $stderr.puts 'Using the standard Ruby profiler.' Profiler__.start_profile profile_me |