diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-21 15:50:19 -0800 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-21 15:50:19 -0800 |
commit | fee07b9da0bddbb1833da947ed73e7a165d040e7 (patch) | |
tree | 2ca31c6143bb4741cf738da1e5be31cb446afc22 /actionpack/lib/action_dispatch | |
parent | cf66d16bdfcb46c217ea06c05b8e0c5dfff73889 (diff) | |
parent | 880688a499b4066d6654a4cd11b76d14cc62865e (diff) | |
download | rails-fee07b9da0bddbb1833da947ed73e7a165d040e7.tar.gz rails-fee07b9da0bddbb1833da947ed73e7a165d040e7.tar.bz2 rails-fee07b9da0bddbb1833da947ed73e7a165d040e7.zip |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index bf2443c1be..a4dc5e0956 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -5,7 +5,7 @@ module ActionDispatch module Routing class RouteSet #:nodoc: NotFound = lambda { |env| - raise ActionController::RoutingError, "No route matches #{env['PATH_INFO'].inspect} with #{env.inspect}" + raise ActionController::RoutingError, "No route matches #{env['PATH_INFO'].inspect}" } PARAMETERS_KEY = 'action_dispatch.request.path_parameters' @@ -426,7 +426,7 @@ module ActionDispatch end end - raise ActionController::RoutingError, "No route matches #{path.inspect} with #{environment.inspect}" + raise ActionController::RoutingError, "No route matches #{path.inspect}" end end end |