aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-09-22 00:03:05 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-09-22 00:03:05 +0000
commitb96fbe81b8e998b2880eeaffdd072347d851b943 (patch)
treeb168d036a98ac7f9b064abc8441c375b695f867f
parent236cf90bf16c93a112d1b6ca8ece47ba41802058 (diff)
downloadrails-b96fbe81b8e998b2880eeaffdd072347d851b943.tar.gz
rails-b96fbe81b8e998b2880eeaffdd072347d851b943.tar.bz2
rails-b96fbe81b8e998b2880eeaffdd072347d851b943.zip
Look for rake tasks in plugin subdirs. Closes #6259.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5159 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/tasks/rails.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 07560f26c7..5f2b332430 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Look for rake tasks in plugin subdirs. #6259 [obrie]
+
* Added map.connect ':controller/:action/:id.:format' as a default route to config/routes.rb [DHH]
* Updated prototype.js to 1.5.0_rc1 with latest fixes. [Rick Olson]
diff --git a/railties/lib/tasks/rails.rb b/railties/lib/tasks/rails.rb
index 48a9d67b65..16e8b1ccb1 100644
--- a/railties/lib/tasks/rails.rb
+++ b/railties/lib/tasks/rails.rb
@@ -5,4 +5,4 @@ Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext }
# Load any custom rakefile extensions
Dir["./lib/tasks/**/*.rake"].sort.each { |ext| load ext }
-Dir["./vendor/plugins/*/tasks/**/*.rake"].sort.each { |ext| load ext } \ No newline at end of file
+Dir["./vendor/plugins/**/tasks/**/*.rake"].sort.each { |ext| load ext }