aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing/route_set.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-01-12 21:19:10 +0100
committerXavier Noria <fxn@hashref.com>2011-01-12 21:19:10 +0100
commit8b293e99ff2da0b5a60ff7bc5cde7bda9a2f715e (patch)
tree68afb497f317dab1652defe0f96bd20051b572cf /actionpack/lib/action_dispatch/routing/route_set.rb
parent5bc98c9510a369a22b856cbe952d640f3825bb5c (diff)
parent31293ba9d33f5b5f62ee760a548b4f5438183f22 (diff)
downloadrails-8b293e99ff2da0b5a60ff7bc5cde7bda9a2f715e.tar.gz
rails-8b293e99ff2da0b5a60ff7bc5cde7bda9a2f715e.tar.bz2
rails-8b293e99ff2da0b5a60ff7bc5cde7bda9a2f715e.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 03bfe178e5..683fa19380 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -450,7 +450,7 @@ module ActionDispatch
end
def raise_routing_error
- raise ActionController::RoutingError.new("No route matches #{options.inspect}")
+ raise ActionController::RoutingError, "No route matches #{options.inspect}"
end
def different_controller?