diff options
| author | Carl Lerche <carllerche@mac.com> | 2009-11-25 14:29:28 -0800 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2009-11-25 14:29:28 -0800 |
| commit | 34eac1cf1cf52784b4c344b44034d98adebdcc28 (patch) | |
| tree | 786923bf91a48d24ede63cc57b04f8867d7adc50 | |
| parent | 71a6b0465be2ebbc9268423bafb1e764ce044b9d (diff) | |
| download | rails-34eac1cf1cf52784b4c344b44034d98adebdcc28.tar.gz rails-34eac1cf1cf52784b4c344b44034d98adebdcc28.tar.bz2 rails-34eac1cf1cf52784b4c344b44034d98adebdcc28.zip | |
Load application specific rake tasks in the application object
| -rw-r--r-- | railties/lib/rails/application.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/tasks.rb | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index e49ea8973b..7ea79aa9c9 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -29,6 +29,8 @@ module Rails def load_tasks require "rails/tasks" + Dir["#{root}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext } + Dir["#{root}/lib/tasks/**/*.rake"].sort.each { |ext| load ext } task :environment do $rails_rake_task = true initialize! 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 } |