diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/rails.rb | 2 |
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 } |