diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-24 15:24:57 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-24 15:24:57 -0800 |
| commit | 38af368360ab35600ef69b21d85ae9604e6ebb22 (patch) | |
| tree | ce198e83d0523584f7def682bff537c9893e0099 /actionpack/lib/action_dispatch/routing/route_set.rb | |
| parent | 2b7256a42e63640d6e94fe80ee67093ed0f06e4c (diff) | |
| parent | 46b376962f064077734773c7e1eea5881e5d5696 (diff) | |
| download | rails-38af368360ab35600ef69b21d85ae9604e6ebb22.tar.gz rails-38af368360ab35600ef69b21d85ae9604e6ebb22.tar.bz2 rails-38af368360ab35600ef69b21d85ae9604e6ebb22.zip | |
Merge
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 2 |
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 a4dc5e0956..498ad3268c 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -273,7 +273,7 @@ module ActionDispatch # TODO: Move this into Railties if defined?(Rails.application) # Find namespaces in controllers/ directory - Rails.application.configuration.controller_paths.each do |load_path| + Rails.application.config.controller_paths.each do |load_path| load_path = File.expand_path(load_path) Dir["#{load_path}/**/*_controller.rb"].collect do |path| namespaces << File.dirname(path).sub(/#{load_path}\/?/, '') |