diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2009-12-17 11:24:02 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2009-12-17 11:24:02 +1100 |
| commit | 186cd7bc530f705b889c27f3680ab48c7c10a6f3 (patch) | |
| tree | 76955e442615d77ee05ef2a8260c5373e1cac680 /railties/lib/rails/tasks.rb | |
| parent | 5f2395041d1578433fa825ed5c6f26a201f2203d (diff) | |
| parent | b9d4ceb43c9497fb1c47d8b1e1e6a24a9e157384 (diff) | |
| download | rails-186cd7bc530f705b889c27f3680ab48c7c10a6f3.tar.gz rails-186cd7bc530f705b889c27f3680ab48c7c10a6f3.tar.bz2 rails-186cd7bc530f705b889c27f3680ab48c7c10a6f3.zip | |
Merge branch 'rails'
Conflicts:
actionmailer/lib/action_mailer.rb
actionmailer/lib/action_mailer/delivery_method/smtp.rb
Diffstat (limited to 'railties/lib/rails/tasks.rb')
| -rw-r--r-- | railties/lib/rails/tasks.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/railties/lib/rails/tasks.rb b/railties/lib/rails/tasks.rb index 82113a297c..dc886f4a4d 100644 --- a/railties/lib/rails/tasks.rb +++ b/railties/lib/rails/tasks.rb @@ -16,8 +16,3 @@ $VERBOSE = nil ).each do |task| load "rails/tasks/#{task}.rake" end - -# Load any custom rakefile extensions -# TODO: Don't hardcode these paths. -Dir["#{Rails.root}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext } -Dir["#{Rails.root}/lib/tasks/**/*.rake"].sort.each { |ext| load ext } |