aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2012-08-29 12:03:06 -0700
committerAndrew White <andyw@pixeltrix.co.uk>2012-08-29 12:03:06 -0700
commit46d85438fed2a44cb6e9882c532d33ca25211c57 (patch)
tree619bc2ef204998ff7b4b974d3bb2bf4296396db6 /actionpack/lib/action_controller
parent3b2c42cb56f8f838b6a376132bd10a04bddc4045 (diff)
parentcc57b2a422a18f22f8ecf6912ebfab0da0ac3c8a (diff)
downloadrails-46d85438fed2a44cb6e9882c532d33ca25211c57.tar.gz
rails-46d85438fed2a44cb6e9882c532d33ca25211c57.tar.bz2
rails-46d85438fed2a44cb6e9882c532d33ca25211c57.zip
Merge pull request #7230 from schneems/schneems/expose_required_keys
Add Missing Keys from Journey on Failed URL Format
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/exceptions.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/exceptions.rb b/actionpack/lib/action_controller/metal/exceptions.rb
index 8fd8f4797c..3c9d0c86a7 100644
--- a/actionpack/lib/action_controller/metal/exceptions.rb
+++ b/actionpack/lib/action_controller/metal/exceptions.rb
@@ -16,6 +16,9 @@ module ActionController
end
end
+ class ActionController::UrlGenerationError < RoutingError #:nodoc:
+ end
+
class MethodNotAllowed < ActionControllerError #:nodoc:
def initialize(*allowed_methods)
super("Only #{allowed_methods.to_sentence(:locale => :en)} requests are allowed.")