diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2009-12-23 19:18:11 -0800 |
|---|---|---|
| committer | Carlhuda <carlhuda@engineyard.com> | 2009-12-23 19:18:11 -0800 |
| commit | 84f1137ef87ff3c8e7cff5e8363d1f116b23fcae (patch) | |
| tree | d6fe70688d13cbb24302175d348a997ed955ad51 /actionpack/lib/action_dispatch/routing/route_set.rb | |
| parent | c4d6d50a46a0fe53f75aadc306212b5437e22ed8 (diff) | |
| parent | 7a6f73e79b850e05d8d9639310159679ef872fb7 (diff) | |
| download | rails-84f1137ef87ff3c8e7cff5e8363d1f116b23fcae.tar.gz rails-84f1137ef87ff3c8e7cff5e8363d1f116b23fcae.tar.bz2 rails-84f1137ef87ff3c8e7cff5e8363d1f116b23fcae.zip | |
Merge remote branch 'origin/master'
Conflicts:
railties/lib/rails/application.rb
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}\/?/, '') |