aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/exceptions.rb
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2014-10-27 22:46:19 +0000
committerAndrew White <pixeltrix@users.noreply.github.com>2014-10-27 22:46:19 +0000
commitdf0ea90cf14057c6d0ff803cdb22d8147b14ecc4 (patch)
tree076ad8140e3d8e3bd57fd41a5b8e50ad21168c6e /actionpack/lib/action_controller/metal/exceptions.rb
parent5d6fca0c04bab69dabe881e3e6741eff30c13c31 (diff)
parent8e1362be3fa8afa352a7acc4a1561205bcdada1e (diff)
downloadrails-df0ea90cf14057c6d0ff803cdb22d8147b14ecc4.tar.gz
rails-df0ea90cf14057c6d0ff803cdb22d8147b14ecc4.tar.bz2
rails-df0ea90cf14057c6d0ff803cdb22d8147b14ecc4.zip
Merge pull request #16229 from byroot/stop-swallowing-url-generation-errors
UrlGenerationError are not catched as 404 anymore
Diffstat (limited to 'actionpack/lib/action_controller/metal/exceptions.rb')
-rw-r--r--actionpack/lib/action_controller/metal/exceptions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/exceptions.rb b/actionpack/lib/action_controller/metal/exceptions.rb
index 3844dbf2a6..18e003741d 100644
--- a/actionpack/lib/action_controller/metal/exceptions.rb
+++ b/actionpack/lib/action_controller/metal/exceptions.rb
@@ -25,7 +25,7 @@ module ActionController
end
end
- class ActionController::UrlGenerationError < RoutingError #:nodoc:
+ class ActionController::UrlGenerationError < ActionControllerError #:nodoc:
end
class MethodNotAllowed < ActionControllerError #:nodoc: