aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-12-22 08:26:00 +0100
committerJosé Valim <jose.valim@gmail.com>2009-12-22 08:26:00 +0100
commit4b8330d2d50ae4de14dd43ffbea4d91804553140 (patch)
tree8d925e361688cf09ab6e3fe8df6b9609a69ffa83 /actionpack/lib/action_dispatch
parent5f34421c77b4cd873baadbbca877a93de5a4d602 (diff)
parent8e48a5ef0ca488b2264acd2b38bdae14970c011f (diff)
downloadrails-4b8330d2d50ae4de14dd43ffbea4d91804553140.tar.gz
rails-4b8330d2d50ae4de14dd43ffbea4d91804553140.tar.bz2
rails-4b8330d2d50ae4de14dd43ffbea4d91804553140.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb4
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