aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-04-30 16:40:42 -0700
committerCarl Lerche <carllerche@mac.com>2010-04-30 16:40:42 -0700
commit6c280f3398966ffba45069500ff43d632513fe44 (patch)
treeb05826e154f04707d0abeefcab1786109b46e6a8 /actionpack/lib/action_dispatch/routing
parent95c98799a4871fb3eb92729d0a3db72a823b070a (diff)
downloadrails-6c280f3398966ffba45069500ff43d632513fe44.tar.gz
rails-6c280f3398966ffba45069500ff43d632513fe44.tar.bz2
rails-6c280f3398966ffba45069500ff43d632513fe44.zip
RouteSet does not raise ActionController::RoutingError when no routes match anymore. Instead, it follows the X-Cascade convention. ShowExceptions checks for X-Cascade so that the routing error page can still be displayed.
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index fdbff74071..0d071dd7fe 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -6,10 +6,6 @@ require 'action_dispatch/routing/deprecated_mapper'
module ActionDispatch
module Routing
class RouteSet #:nodoc:
- NotFound = lambda { |env|
- raise ActionController::RoutingError, "No route matches #{env['PATH_INFO'].inspect}"
- }
-
PARAMETERS_KEY = 'action_dispatch.request.path_parameters'
class Dispatcher #:nodoc:
@@ -224,7 +220,6 @@ module ActionDispatch
def finalize!
return if @finalized
@finalized = true
- @set.add_route(NotFound)
@set.freeze
end