aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/CHANGELOG5
-rw-r--r--railties/lib/tasks/rails.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 18b42884ab..7b661857b5 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,3 +1,8 @@
+*SVN*
+
+* Load rake task files in alphabetical order so you can build dependencies and count on them #2554 [Blair Zajac]
+
+
*0.14.2 (RC3)* (October 26th, 2005)
* Constants set in the development/test/production environment file are set in Object
diff --git a/railties/lib/tasks/rails.rb b/railties/lib/tasks/rails.rb
index 331a6dad35..48a9d67b65 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"].each { |ext| load ext }
-Dir["./vendor/plugins/*/tasks/**/*.rake"].each { |ext| load ext } \ No newline at end of file
+Dir["./lib/tasks/**/*.rake"].sort.each { |ext| load ext }
+Dir["./vendor/plugins/*/tasks/**/*.rake"].sort.each { |ext| load ext } \ No newline at end of file