aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/railties
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-01-15 14:51:58 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-01-15 14:51:58 -0200
commitc372eec97c53cd3af55443201b74bfe80747d313 (patch)
tree07648ace06818d59aa85bc4efa5210263c1d6052 /activerecord/lib/active_record/railties
parent8348f9ea72c9b50fc4d4462fd9ebe3bba932c783 (diff)
downloadrails-c372eec97c53cd3af55443201b74bfe80747d313.tar.gz
rails-c372eec97c53cd3af55443201b74bfe80747d313.tar.bz2
rails-c372eec97c53cd3af55443201b74bfe80747d313.zip
Revert "Merge pull request #8930 from cordawyn/ordered_railties"
This reverts commit 8348f9ea72c9b50fc4d4462fd9ebe3bba932c783, reversing changes made to 9dfe2d6f9fabddf9a451a995678a9648c8aaf401. Reason: this broke railties tests as explained in the issue, and the author is going to review and report back. https://github.com/rails/rails/pull/8930#issuecomment-12272671
Diffstat (limited to 'activerecord/lib/active_record/railties')
-rw-r--r--activerecord/lib/active_record/railties/databases.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index ab061c26ad..259d0ff12b 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -420,7 +420,7 @@ namespace :railties do
task :migrations => :'db:load_config' do
to_load = ENV['FROM'].blank? ? :all : ENV['FROM'].split(",").map {|n| n.strip }
railties = {}
- Rails.application.ordered_railties.each do |railtie|
+ Rails.application.railties.each do |railtie|
next unless to_load == :all || to_load.include?(railtie.railtie_name)
if railtie.respond_to?(:paths) && (path = railtie.paths['db/migrate'].first)