aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2013-04-22 07:03:34 -0700
committerAndrew White <andyw@pixeltrix.co.uk>2013-04-22 07:03:34 -0700
commit0fea87c49fd43a2f0d1a0eb66333a189b39afcc8 (patch)
tree2af61321f1bc33de5e5ecb2e78347e70ea13982e /actionpack/lib/action_dispatch
parentf95b06f96faa009b7d2523c3c244ca6d8512e373 (diff)
parentec462b4de7904e0e55a312940e88b9e825bf955c (diff)
downloadrails-0fea87c49fd43a2f0d1a0eb66333a189b39afcc8.tar.gz
rails-0fea87c49fd43a2f0d1a0eb66333a189b39afcc8.tar.bz2
rails-0fea87c49fd43a2f0d1a0eb66333a189b39afcc8.zip
Merge pull request #10299 from econsultancy/use-method-not-allowed-exception
Use MethodNotAllowed exception rather than UnknownHttpMethod
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/middleware/exception_wrapper.rb1
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 7489ce8028..0a19381c89 100644
--- a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
+++ b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
@@ -9,6 +9,7 @@ module ActionDispatch
'ActionController::RoutingError' => :not_found,
'AbstractController::ActionNotFound' => :not_found,
'ActionController::MethodNotAllowed' => :method_not_allowed,
+ 'ActionController::UnknownHttpMethod' => :method_not_allowed,
'ActionController::NotImplemented' => :not_implemented,
'ActionController::UnknownFormat' => :not_acceptable,
'ActionController::InvalidAuthenticityToken' => :unprocessable_entity,