aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-01 20:46:18 +0100
committerJosé Valim <jose.valim@gmail.com>2011-12-01 20:46:18 +0100
commit750bb5c865ac9234da91ec451eec7d9de55b8f9b (patch)
tree16873e2a42d812f637cde622ab933e1e7667f10c /railties/lib
parent956ecff8337908d7c3908977a5c8e12296a5b576 (diff)
downloadrails-750bb5c865ac9234da91ec451eec7d9de55b8f9b.tar.gz
rails-750bb5c865ac9234da91ec451eec7d9de55b8f9b.tar.bz2
rails-750bb5c865ac9234da91ec451eec7d9de55b8f9b.zip
Split ShowExceptions responsibilities in two middlewares.
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/application.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 2a62446a04..f5f47acfbc 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -195,10 +195,13 @@ module Rails
middleware.use ::ActionDispatch::RequestId
middleware.use ::Rails::Rack::Logger, config.log_tags # must come after Rack::MethodOverride to properly log overridden methods
middleware.use ::ActionDispatch::ShowExceptions
+ middleware.use ::ActionDispatch::DebugExceptions
middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
+
if config.action_dispatch.x_sendfile_header.present?
middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
end
+
middleware.use ::ActionDispatch::Reloader unless config.cache_classes
middleware.use ::ActionDispatch::Callbacks
middleware.use ::ActionDispatch::Cookies