aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorlest <just.lest@gmail.com>2011-11-21 20:13:54 +0300
committerlest <just.lest@gmail.com>2011-11-22 11:38:24 +0300
commita9e8cf78fda696738f63e726796f6232c3751603 (patch)
treee1e12a371dd995ffc2f843ea9ae4fe8d4f7ada78 /actionpack/lib/action_controller
parent8f57bf207ff4f28fa8da4544ebc573007b65439d (diff)
downloadrails-a9e8cf78fda696738f63e726796f6232c3751603.tar.gz
rails-a9e8cf78fda696738f63e726796f6232c3751603.tar.bz2
rails-a9e8cf78fda696738f63e726796f6232c3751603.zip
add ActionController::Metal#show_detailed_exceptions?
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 125dbf6bb5..d5f150e7c9 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -196,10 +196,15 @@ module ActionController
@_request = request
@_env = request.env
@_env['action_controller.instance'] = self
+ @_env['action_dispatch.show_detailed_exceptions'] = show_detailed_exceptions?
process(name)
to_a
end
+ def show_detailed_exceptions?
+ defined?(Rails.application) && Rails.application.config.consider_all_requests_local || request.local?
+ end
+
def to_a #:nodoc:
response ? response.to_a : [status, headers, response_body]
end