diff options
| author | José Valim <jose.valim@gmail.com> | 2012-05-06 02:09:10 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-05-06 02:09:10 -0700 |
| commit | 13811eef778d45469c81e69aaf04fb76d39fae22 (patch) | |
| tree | d79f73c120ec40086b2b6731ebda40e2531a8754 /actionpack/lib/action_dispatch/middleware/exception_wrapper.rb | |
| parent | bad119cae5ff6f3d27d82b9bdc9fc3cf4f67d271 (diff) | |
| parent | 6471ced656ad0e61f12b2a7d6f51ef5b2408e64a (diff) | |
| download | rails-13811eef778d45469c81e69aaf04fb76d39fae22.tar.gz rails-13811eef778d45469c81e69aaf04fb76d39fae22.tar.bz2 rails-13811eef778d45469c81e69aaf04fb76d39fae22.zip | |
Merge pull request #2313 from ssoroka/master
Raise a rescuable exception, rather than responding with a head :not_acceptable (406)
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/exception_wrapper.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/exception_wrapper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb index c0532c80c4..982f6641bf 100644 --- a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb +++ b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb @@ -10,6 +10,7 @@ module ActionDispatch 'AbstractController::ActionNotFound' => :not_found, 'ActionController::MethodNotAllowed' => :method_not_allowed, 'ActionController::NotImplemented' => :not_implemented, + 'ActionController::UnknownFormat' => :not_acceptable, 'ActionController::InvalidAuthenticityToken' => :unprocessable_entity ) |