aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-19 20:07:50 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-19 20:07:50 +0100
commitd2759d125ae64e6fd64c8bffe7b15568698654bf (patch)
treedda00e11fdfd44dab746cd70dd2de8e3419908e2 /railties
parent4ca97650880a751901c4370a50c806a84fa529f4 (diff)
downloadrails-d2759d125ae64e6fd64c8bffe7b15568698654bf.tar.gz
rails-d2759d125ae64e6fd64c8bffe7b15568698654bf.tar.bz2
rails-d2759d125ae64e6fd64c8bffe7b15568698654bf.zip
Avoid load tasks from plugins recursively (so stuff in tests or vendor does not get loaded).
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/plugin.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 0c09730963..c3b81bcd3e 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -27,7 +27,7 @@ module Rails
end
def load_tasks
- Dir["#{path}/**/tasks/**/*.rake"].sort.each { |ext| load ext }
+ Dir["#{path}/{tasks,lib/tasks,rails/tasks}/**/*.rake"].sort.each { |ext| load ext }
end
initializer :add_to_load_path, :after => :set_autoload_paths do |app|