aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-11-09 07:56:10 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-11-09 07:56:10 +0000
commit089d3ec3186014ace8c80c989c87c33a6b21f582 (patch)
treea36c03e7ffdca754ff9887bab230ca7e57589114 /railties
parent57313c54bfc3a47f32507cb466df91b5a9688db7 (diff)
downloadrails-089d3ec3186014ace8c80c989c87c33a6b21f582.tar.gz
rails-089d3ec3186014ace8c80c989c87c33a6b21f582.tar.bz2
rails-089d3ec3186014ace8c80c989c87c33a6b21f582.zip
Rake: use absolute paths to load lib and vendor tasks so they may be run outside of RAILS_ROOT. Closes #6584.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5469 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/tasks/rails.rb4
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 }