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_controller | |
| 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_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/exceptions.rb | 3 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/mime_responds.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/exceptions.rb b/actionpack/lib/action_controller/metal/exceptions.rb index 9a9db0fe5f..90648c37ad 100644 --- a/actionpack/lib/action_controller/metal/exceptions.rb +++ b/actionpack/lib/action_controller/metal/exceptions.rb @@ -38,4 +38,7 @@ module ActionController class UnknownHttpMethod < ActionControllerError #:nodoc: end + + class UnknownFormat < ActionControllerError #:nodoc: + end end diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb index f467b74256..7917926978 100644 --- a/actionpack/lib/action_controller/metal/mime_responds.rb +++ b/actionpack/lib/action_controller/metal/mime_responds.rb @@ -375,8 +375,7 @@ module ActionController #:nodoc: lookup_context.rendered_format = lookup_context.formats.first collector else - head :not_acceptable - nil + raise ActionController::UnknownFormat end end |