diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/rails.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 24975658cf..ac05ec343c 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Rake: use absolute paths to load lib and vendor tasks so they may be run outside of RAILS_ROOT. #6584 [jchris] + * Remove temporary crutch to help ApplicationController be unloaded. Closes #6496. [Nicholas Seckar] * scaffold_resource generator uses _path named routes and head instead of render :nothing => true. #6545 [Josh Susser] diff --git a/railties/lib/tasks/rails.rb b/railties/lib/tasks/rails.rb index 16e8b1ccb1..ec4847a2a5 100644 --- a/railties/lib/tasks/rails.rb +++ b/railties/lib/tasks/rails.rb @@ -4,5 +4,5 @@ $VERBOSE = nil 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 } +Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext } +Dir["#{RAILS_ROOT}/vendor/plugins/**/tasks/**/*.rake"].sort.each { |ext| load ext } |