diff options
author | José Valim <jose.valim@gmail.com> | 2011-05-08 03:33:22 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-05-08 03:33:22 -0700 |
commit | 30db3a82f653e7d7215e41bec525932cf5b17de1 (patch) | |
tree | bb59f9fd10c818c4ca89ad1e2b18cedad37a0759 /railties/lib | |
parent | ad129639c7e72c3ba686db6202a4bff2cb2cfbfe (diff) | |
parent | 17a91a6ef93008170e50c073d1c3794f038a0a33 (diff) | |
download | rails-30db3a82f653e7d7215e41bec525932cf5b17de1.tar.gz rails-30db3a82f653e7d7215e41bec525932cf5b17de1.tar.bz2 rails-30db3a82f653e7d7215e41bec525932cf5b17de1.zip |
Merge pull request #430 from dlee/methodoverride
Logs should show overridden method; Issue 426
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/application.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index dd01bbab1d..1e4d25f18c 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -157,7 +157,8 @@ module Rails middleware.use ::Rack::Lock unless config.allow_concurrency middleware.use ::Rack::Runtime - middleware.use ::Rails::Rack::Logger + middleware.use ::Rack::MethodOverride + middleware.use ::Rails::Rack::Logger # must come after Rack::MethodOverride to properly log overridden methods middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header @@ -171,7 +172,6 @@ module Rails end middleware.use ::ActionDispatch::ParamsParser - middleware.use ::Rack::MethodOverride middleware.use ::ActionDispatch::Head middleware.use ::Rack::ConditionalGet middleware.use ::Rack::ETag, "no-cache" @@ -199,4 +199,4 @@ module Rails require "rails/console/helpers" end end -end
\ No newline at end of file +end |