diff options
| author | José Valim <jose.valim@gmail.com> | 2009-11-23 22:04:18 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-11-23 22:04:18 -0200 |
| commit | 4ff66b6b85d1351e447f18c027f1dba6bcf23a7b (patch) | |
| tree | a46d6c65c5c67964bc8658bf991157f0f8056f55 /railties/lib/rails/rack | |
| parent | 01ae99c681d31803f3a29f8305c9a041aa456660 (diff) | |
| parent | 934bb012ba3f1da5cd181ae5c2d84f697a3c58a1 (diff) | |
| download | rails-4ff66b6b85d1351e447f18c027f1dba6bcf23a7b.tar.gz rails-4ff66b6b85d1351e447f18c027f1dba6bcf23a7b.tar.bz2 rails-4ff66b6b85d1351e447f18c027f1dba6bcf23a7b.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/lib/rails/rack')
| -rw-r--r-- | railties/lib/rails/rack/debugger.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/rack/static.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/lib/rails/rack/debugger.rb b/railties/lib/rails/rack/debugger.rb index aa2711c616..0a7b405553 100644 --- a/railties/lib/rails/rack/debugger.rb +++ b/railties/lib/rails/rack/debugger.rb @@ -4,6 +4,8 @@ module Rails def initialize(app) @app = app + ARGV.clear # clear ARGV so that script/server options aren't passed to IRB + require_library_or_gem 'ruby-debug' ::Debugger.start ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings) diff --git a/railties/lib/rails/rack/static.rb b/railties/lib/rails/rack/static.rb index d6b8face27..ebe8b9e103 100644 --- a/railties/lib/rails/rack/static.rb +++ b/railties/lib/rails/rack/static.rb @@ -1,5 +1,5 @@ require 'action_dispatch' module Rails::Rack - Static = Deprecation::DeprecatedConstantProxy.new('Rails::Rack::Static', ActionDispatch::Static) + Static = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Rails::Rack::Static', ActionDispatch::Static) end |