From 17250c91570d3ba20a4dbbe5746d4558f1a34c87 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 11 Sep 2005 09:17:38 +0000 Subject: 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 --- railties/CHANGELOG | 2 ++ railties/bin/profiler | 1 + 2 files changed, 3 insertions(+) (limited to 'railties') 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 -- cgit v1.2.3