diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-02-27 12:21:34 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-02-27 12:21:34 -0800 |
commit | df2adc4c516f9f16942fbc799666c99bfd20d17c (patch) | |
tree | 46a0a077422cc01d9ea195cdadb469a1ceb7e013 /railties/lib/initializer.rb | |
parent | 884068a13ac097450e183f4eca50509f2037c122 (diff) | |
parent | 943d64b1c857944666bff2572857abe866615274 (diff) | |
download | rails-df2adc4c516f9f16942fbc799666c99bfd20d17c.tar.gz rails-df2adc4c516f9f16942fbc799666c99bfd20d17c.tar.bz2 rails-df2adc4c516f9f16942fbc799666c99bfd20d17c.zip |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/lib/initializer.rb')
-rw-r--r-- | railties/lib/initializer.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 09affe9e36..24ce3e75ff 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -559,6 +559,8 @@ Run `rake gems:install` to install the missing gems. end def initialize_metal + Rails::Rack::Metal.metal_paths += plugin_loader.engine_metal_paths + configuration.middleware.insert_before( :"ActionController::RewindableInput", Rails::Rack::Metal, :if => Rails::Rack::Metal.metals.any?) |