aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-11-22 07:19:39 -0800
committerJosé Valim <jose.valim@gmail.com>2011-11-22 07:19:39 -0800
commit39ecbfdab9868cbd5166a7b0ee5b59c00389e2bd (patch)
treea593c0c51564e1f99e813d858312664eb76f6cf1 /railties
parent8cae31c800f281212c9c5b5ac0ea2be98c4aa611 (diff)
parent3a1d51959bf569a7419fe8ab9416b338334b4800 (diff)
downloadrails-39ecbfdab9868cbd5166a7b0ee5b59c00389e2bd.tar.gz
rails-39ecbfdab9868cbd5166a7b0ee5b59c00389e2bd.tar.bz2
rails-39ecbfdab9868cbd5166a7b0ee5b59c00389e2bd.zip
Merge pull request #3717 from lest/show-exceptions-refactor
Show exceptions refactor: controller should be responsible for choice to show exceptions
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/application.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 82fffe86bb..817fa39cab 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -166,7 +166,7 @@ module Rails
middleware.use ::Rack::MethodOverride
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, config.consider_all_requests_local
+ middleware.use ::ActionDispatch::ShowExceptions
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