diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-05-01 02:23:47 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-05-01 02:23:47 -0700 |
| commit | efba1d4227514a6ce4880910a6531b0a6c3c75aa (patch) | |
| tree | daff4155b8c19b915125ac0b0da458279358e743 /actionpack/lib/action_dispatch/routing | |
| parent | 81807e0fe2879e08563c91ee6809ab6d1d0bd081 (diff) | |
| parent | 6c280f3398966ffba45069500ff43d632513fe44 (diff) | |
| download | rails-efba1d4227514a6ce4880910a6531b0a6c3c75aa.tar.gz rails-efba1d4227514a6ce4880910a6531b0a6c3c75aa.tar.bz2 rails-efba1d4227514a6ce4880910a6531b0a6c3c75aa.zip | |
Merge commit 'rails/master'
Conflicts:
railties/guides/source/index.html.erb
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 5 |
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 |