Permalink
Browse files

Merge [5469] from trunk.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5470 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
jeremy committed Nov 9, 2006
1 parent dfa070a commit 5e677b67b59abe1ca89d58554958a78ee554ddf0
Showing with 4 additions and 2 deletions.
  1. +2 −0 railties/CHANGELOG
  2. +2 −2 railties/lib/tasks/rails.rb
View
@@ -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]
@@ -4,5 +4,5 @@
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 }

0 comments on commit 5e677b6

Please sign in to comment.