aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorDavid Lee <davidomundo@gmail.com>2011-05-07 01:19:01 -0700
committerDavid Lee <davidomundo@gmail.com>2011-05-07 03:04:26 -0700
commit17a91a6ef93008170e50c073d1c3794f038a0a33 (patch)
tree46d33bc3274dae6a75aa17c7e3ef1b5cc7ee6f79 /railties/lib/rails
parentfa8623b52ef136d9479fe4f9cc61256228d590e0 (diff)
downloadrails-17a91a6ef93008170e50c073d1c3794f038a0a33.tar.gz
rails-17a91a6ef93008170e50c073d1c3794f038a0a33.tar.bz2
rails-17a91a6ef93008170e50c073d1c3794f038a0a33.zip
Logs should show overridden method; Issue 426
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/application.rb6
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