aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/CHANGELOG5
-rw-r--r--railties/lib/tasks/rails.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 269b908f34..2f6bd079eb 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,3 +1,8 @@
+*SVN*
+
+* Include tasks from vendor/plugins/*/tasks in the Rakefile #2545 [Rick Olson]
+
+
*0.14.1* (October 19th, 2005)
* Don't clean RAILS_ROOT on windows
diff --git a/railties/lib/tasks/rails.rb b/railties/lib/tasks/rails.rb
index de545cf10e..331a6dad35 100644
--- a/railties/lib/tasks/rails.rb
+++ b/railties/lib/tasks/rails.rb
@@ -4,4 +4,5 @@ $VERBOSE = nil
Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext }
# Load any custom rakefile extensions
-Dir["./lib/tasks/**/*.rake"].each { |ext| load ext } \ No newline at end of file
+Dir["./lib/tasks/**/*.rake"].each { |ext| load ext }
+Dir["./vendor/plugins/*/tasks/**/*.rake"].each { |ext| load ext } \ No newline at end of file