aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/railtie.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-01 20:02:00 +0100
committerJosé Valim <jose.valim@gmail.com>2011-12-01 20:02:00 +0100
commit0b677b18ff75cd4bf8fd0b2f9579cd84ca3dc2b1 (patch)
treeeac43714a577df301013d01d81d3890cffcbabd8 /actionpack/lib/action_dispatch/railtie.rb
parentb4359bc7234b61c9a4a104542fa77f63bb84d7e1 (diff)
downloadrails-0b677b18ff75cd4bf8fd0b2f9579cd84ca3dc2b1.tar.gz
rails-0b677b18ff75cd4bf8fd0b2f9579cd84ca3dc2b1.tar.bz2
rails-0b677b18ff75cd4bf8fd0b2f9579cd84ca3dc2b1.zip
Add an ExceptionWrapper that wraps an exception and provide convenience helpers.
Diffstat (limited to 'actionpack/lib/action_dispatch/railtie.rb')
-rw-r--r--actionpack/lib/action_dispatch/railtie.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb
index 36a31be0c2..2ba3198ebd 100644
--- a/actionpack/lib/action_dispatch/railtie.rb
+++ b/actionpack/lib/action_dispatch/railtie.rb
@@ -22,8 +22,8 @@ module ActionDispatch
ActionDispatch::Http::URL.tld_length = app.config.action_dispatch.tld_length
ActionDispatch::Request.ignore_accept_header = app.config.action_dispatch.ignore_accept_header
- ActionDispatch::ShowExceptions.rescue_responses.merge!(config.action_dispatch.rescue_responses)
- ActionDispatch::ShowExceptions.rescue_templates.merge!(config.action_dispatch.rescue_templates)
+ ActionDispatch::ExceptionWrapper.rescue_responses.merge!(config.action_dispatch.rescue_responses)
+ ActionDispatch::ExceptionWrapper.rescue_templates.merge!(config.action_dispatch.rescue_templates)
config.action_dispatch.always_write_cookie = Rails.env.development? if config.action_dispatch.always_write_cookie.nil?
ActionDispatch::Cookies::CookieJar.always_write_cookie = config.action_dispatch.always_write_cookie