diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-12-02 14:10:22 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-12-02 14:10:22 -0600 |
| commit | 8db038227ca4cbcba01a86ef5fb94cb13c780463 (patch) | |
| tree | b03e34fa0800175021719994fb6f1d04488e22d3 /actionpack/lib/action_dispatch/routing/mapper.rb | |
| parent | 4dee277a9bc05083de6c831cf9aae0846849ecda (diff) | |
| download | rails-8db038227ca4cbcba01a86ef5fb94cb13c780463.tar.gz rails-8db038227ca4cbcba01a86ef5fb94cb13c780463.tar.bz2 rails-8db038227ca4cbcba01a86ef5fb94cb13c780463.zip | |
Move controller namespace tracking into route set so it gets
reloaded in dev mode
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
| -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 34d75e55b6..400039353c 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -383,7 +383,7 @@ module ActionDispatch constraints.reject! { |k, v| segment_keys.include?(k.to_s) } conditions.merge!(constraints) - requirements[:controller] ||= Routing.controller_constraints + requirements[:controller] ||= @set.controller_constraints if via = options[:via] via = Array(via).map { |m| m.to_s.upcase } |