aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-09 11:58:57 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-09 11:58:57 -0800
commitc74cddc9197d03ca641bf35d102199cabf1b9866 (patch)
tree64afc3b79850f6ccde96b9a1ac6d80c4c74a51d1 /activesupport
parent4a1f43878105d701fd2dd769ec3cf7e81d133c09 (diff)
parent17dee01b6f2186888629859fe2e99232225ae5ea (diff)
downloadrails-c74cddc9197d03ca641bf35d102199cabf1b9866.tar.gz
rails-c74cddc9197d03ca641bf35d102199cabf1b9866.tar.bz2
rails-c74cddc9197d03ca641bf35d102199cabf1b9866.zip
Merge commit 'brynary/fix-master-warnings'
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/kernel/debugger.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/kernel/debugger.rb b/activesupport/lib/active_support/core_ext/kernel/debugger.rb
index 0813a51383..59e03e3df7 100644
--- a/activesupport/lib/active_support/core_ext/kernel/debugger.rb
+++ b/activesupport/lib/active_support/core_ext/kernel/debugger.rb
@@ -7,6 +7,7 @@ module Kernel
end
end
+ undef :breakpoint if respond_to?(:breakpoint)
def breakpoint
message = "\n***** The 'breakpoint' command has been renamed 'debugger' -- please change *****\n"
defined?(Rails) ? Rails.logger.info(message) : $stderr.puts(message)