aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2010-02-28 16:39:01 -0600
committerJoshua Peek <josh@joshpeek.com>2010-02-28 16:39:01 -0600
commit7317d9ef4c1361219671dc4405a02ed3896f1742 (patch)
treef9c619a3566717337232869d20cadcb16af2f399 /railties/lib
parent020fdb28ee1d1bdb2dd1aa182869eb2e7c6115cb (diff)
downloadrails-7317d9ef4c1361219671dc4405a02ed3896f1742.tar.gz
rails-7317d9ef4c1361219671dc4405a02ed3896f1742.tar.bz2
rails-7317d9ef4c1361219671dc4405a02ed3896f1742.zip
Remove implicit controller namespacing from new dsl
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/engine.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index b6ac48768d..af47227510 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -43,7 +43,7 @@ module Rails
delegate :middleware, :paths, :root, :to => :config
def load_tasks
- super
+ super
config.paths.lib.tasks.to_a.sort.each { |ext| load(ext) }
end
@@ -77,6 +77,7 @@ module Rails
end
end
+ # DEPRECATED: Remove in 3.1
initializer :add_routing_namespaces do |app|
paths.app.controllers.to_a.each do |load_path|
load_path = File.expand_path(load_path)