diff options
| author | Joshua Peek <josh@joshpeek.com> | 2010-02-28 16:39:01 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2010-02-28 16:39:01 -0600 |
| commit | 7317d9ef4c1361219671dc4405a02ed3896f1742 (patch) | |
| tree | f9c619a3566717337232869d20cadcb16af2f399 /actionpack/lib/action_dispatch/routing/mapper.rb | |
| parent | 020fdb28ee1d1bdb2dd1aa182869eb2e7c6115cb (diff) | |
| download | rails-7317d9ef4c1361219671dc4405a02ed3896f1742.tar.gz rails-7317d9ef4c1361219671dc4405a02ed3896f1742.tar.bz2 rails-7317d9ef4c1361219671dc4405a02ed3896f1742.zip | |
Remove implicit controller namespacing from new dsl
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index bead321c9c..52e7b0e77d 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -88,7 +88,6 @@ module ActionDispatch @requirements ||= returning(@options[:constraints] || {}) do |requirements| requirements.reverse_merge!(@scope[:constraints]) if @scope[:constraints] @options.each { |k, v| requirements[k] = v if v.is_a?(Regexp) } - requirements[:controller] ||= @set.controller_constraints end end |