aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2013-03-31 08:41:28 -0700
committerSteve Klabnik <steve@steveklabnik.com>2013-03-31 08:41:28 -0700
commitfa2e45eedd2839b4bda589346cc993fb136e37fa (patch)
tree8c91ffd1dbc8d5d37f3ab6ba2f691bb74cbfe8e0 /actionpack/lib
parent3b0b573ac3ecbec5b1fa021abbe86b267bbefb8c (diff)
parent1f8499762106e40a6d2a27f27cf8793ffd914f1d (diff)
downloadrails-fa2e45eedd2839b4bda589346cc993fb136e37fa.tar.gz
rails-fa2e45eedd2839b4bda589346cc993fb136e37fa.tar.bz2
rails-fa2e45eedd2839b4bda589346cc993fb136e37fa.zip
Merge pull request #10012 from vipulnsward/fix_AP_error_message_error
fix wrong argument error message [ci skip]
Diffstat (limited to 'actionpack/lib')
-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 7fb4719fa0..07203428d4 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -405,7 +405,7 @@ module ActionDispatch
if name && named_routes[name]
raise ArgumentError, "Invalid route name, already in use: '#{name}' \n" \
- "You may have defined two routes with the same name using the `:as` option, or "
+ "You may have defined two routes with the same name using the `:as` option, or " \
"you may be overriding a route already defined by a resource with the same naming. " \
"For the latter, you can restrict the routes created with `resources` as explained here: \n" \
"http://guides.rubyonrails.org/routing.html#restricting-the-routes-created"