aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-02-09 13:37:46 -0800
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-02-09 13:37:46 -0800
commit56f51888f1ba5833d0d2a7a89c5c6c4d7d2cd0b6 (patch)
tree6d423a91b2298d9908ec4ecb8261c15641c0a4f5 /actionpack/lib
parent34238422b903ee832f8feec73801111768fb8d40 (diff)
parent9e10d591991e8e52488880f5c0d518590716d225 (diff)
downloadrails-56f51888f1ba5833d0d2a7a89c5c6c4d7d2cd0b6.tar.gz
rails-56f51888f1ba5833d0d2a7a89c5c6c4d7d2cd0b6.tar.bz2
rails-56f51888f1ba5833d0d2a7a89c5c6c4d7d2cd0b6.zip
Merge pull request #9234 from senny/9231_no_numbers_in_route_namespaces_allowed
The `:controller` option for routes can contain numbers. closes #9231.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 34f5f80d4d..0a41ed0fcf 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -246,7 +246,7 @@ module ActionDispatch
raise ArgumentError, "missing :action"
end
- if controller.is_a?(String) && controller !~ /\A[a-z_\/]+\z/
+ if controller.is_a?(String) && controller !~ /\A[a-z_0-9\/]*\z/
message = "'#{controller}' is not a supported controller name. This can lead to potential routing problems."
message << " See http://guides.rubyonrails.org/routing.html#specifying-a-controller-to-use"
raise ArgumentError, message