diff options
| author | Carl Lerche & Yehuda Katz <wycats@gmail.com> | 2009-04-13 17:16:07 -0700 |
|---|---|---|
| committer | Carl Lerche & Yehuda Katz <wycats@gmail.com> | 2009-04-13 17:16:07 -0700 |
| commit | d9afc51391e9a22759080399f973ab361d6d51af (patch) | |
| tree | bee325dd51252149c8bd1b1a2db32ddd8bcf2e4f /railties | |
| parent | 647b83d50cba655422bcb83815f618b5a92bfc7d (diff) | |
| download | rails-d9afc51391e9a22759080399f973ab361d6d51af.tar.gz rails-d9afc51391e9a22759080399f973ab361d6d51af.tar.bz2 rails-d9afc51391e9a22759080399f973ab361d6d51af.zip | |
Rails server boots again
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/guides/source/rails_on_rack.textile | 2 | ||||
| -rw-r--r-- | railties/lib/initializer.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/guides/source/rails_on_rack.textile b/railties/guides/source/rails_on_rack.textile index 05581f943f..1164ed821d 100644 --- a/railties/guides/source/rails_on_rack.textile +++ b/railties/guides/source/rails_on_rack.textile @@ -101,7 +101,7 @@ use Rack::Lock use ActionController::Failsafe use ActionController::Session::CookieStore, , {:secret=>"<secret>", :session_key=>"_<app>_session"} use Rails::Rack::Metal -use ActionController::RewindableInput +use ActionDispatch::RewindableInput use ActionController::ParamsParser use Rack::MethodOverride use Rack::Head diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 8eb4212737..c9716f508a 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -568,7 +568,7 @@ Run `rake gems:install` to install the missing gems. Rails::Rack::Metal.metal_paths += plugin_loader.engine_metal_paths configuration.middleware.insert_before( - :"ActionController::RewindableInput", + :"ActionDispatch::RewindableInput", Rails::Rack::Metal, :if => Rails::Rack::Metal.metals.any?) end |