diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-29 10:55:59 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-29 10:55:59 -0700 |
| commit | 8ed1a562c6293c81c894f3fe55fe88610c4f6caa (patch) | |
| tree | 46c5d96d51f5f1d89d0a2802545400d59438fa06 /actionpack/lib/action_dispatch | |
| parent | 7e61a327ce0fdb4b98a76d318ca0b5ffee0be7de (diff) | |
| download | rails-8ed1a562c6293c81c894f3fe55fe88610c4f6caa.tar.gz rails-8ed1a562c6293c81c894f3fe55fe88610c4f6caa.tar.bz2 rails-8ed1a562c6293c81c894f3fe55fe88610c4f6caa.zip | |
"controllers" should be a valid path name
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 |
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 0a1f6afd77..67e7285dcd 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -117,7 +117,7 @@ module ActionDispatch options[$1.to_sym] ||= /.+?/ end - if path_without_format.match(':controller') + if path_pattern.names.map(&:to_sym).include?(:controller) raise ArgumentError, ":controller segment is not allowed within a namespace block" if scope[:module] # Add a default constraint for :controller path segments that matches namespaced |