diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-23 17:11:17 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-23 17:11:17 -0800 |
| commit | 94bb3316353ace661a83563f44a9c47baf438f26 (patch) | |
| tree | 8ef93f951e3a6b9d2cdc14389314babe6b1d2276 /actionpack | |
| parent | 24e1b5560806be54a931922f109f50800dcbbdf5 (diff) | |
| download | rails-94bb3316353ace661a83563f44a9c47baf438f26.tar.gz rails-94bb3316353ace661a83563f44a9c47baf438f26.tar.bz2 rails-94bb3316353ace661a83563f44a9c47baf438f26.zip | |
Shift more responsibility from application class to its singleton instance. Treat instantiation and boot as separate steps. Use app.config rather than app.configuration.
Diffstat (limited to 'actionpack')
| -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}\/?/, '') |