aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/rack/debugger.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2010-02-14 19:28:05 +0000
committerPratik Naik <pratiknaik@gmail.com>2010-02-14 19:28:05 +0000
commit6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3 (patch)
tree3da8d75101aabe3c1d90d0582505ec1480c9d885 /railties/lib/rails/rack/debugger.rb
parent77bf78b3b78a41d4f2f6e733f5c9c00608c0adba (diff)
parenta1b60696e2b13cbe94d748444cc0da37b190fbb8 (diff)
downloadrails-6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3.tar.gz
rails-6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3.tar.bz2
rails-6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3.zip
Merge remote branch 'mainstream/master'
Conflicts: railties/README railties/guides/source/active_support_core_extensions.textile railties/guides/source/getting_started.textile railties/lib/generators/rails/app/templates/README
Diffstat (limited to 'railties/lib/rails/rack/debugger.rb')
-rw-r--r--railties/lib/rails/rack/debugger.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/lib/rails/rack/debugger.rb b/railties/lib/rails/rack/debugger.rb
index 0a7b405553..06e23db5f1 100644
--- a/railties/lib/rails/rack/debugger.rb
+++ b/railties/lib/rails/rack/debugger.rb
@@ -1,10 +1,12 @@
+require 'active_support/core_ext/kernel/requires'
+
module Rails
module Rack
class Debugger
def initialize(app)
@app = app
- ARGV.clear # clear ARGV so that script/server options aren't passed to IRB
+ ARGV.clear # clear ARGV so that rails server options aren't passed to IRB
require_library_or_gem 'ruby-debug'
::Debugger.start