aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorArthur Nogueira Neves <github@arthurnn.com>2015-06-15 20:37:18 +0200
committerArthur Nogueira Neves <github@arthurnn.com>2015-06-15 20:37:18 +0200
commitfeff9595fb1d79885ffc36d8b1a0f16d277de5a9 (patch)
treecaa984465a998d8464e071e56f872ddd9f9cb6d5 /activerecord/lib/active_record
parenta023d5391ef4f70c56eff6f3c386da393eb44648 (diff)
parent0663e52a9fbc7b96695f7dcd0f7a6c987f51ac8e (diff)
downloadrails-feff9595fb1d79885ffc36d8b1a0f16d277de5a9.tar.gz
rails-feff9595fb1d79885ffc36d8b1a0f16d277de5a9.tar.bz2
rails-feff9595fb1d79885ffc36d8b1a0f16d277de5a9.zip
Merge pull request #20016 from steved/sdavidovitz/abort_if_pending
make sure to load_config for db:abort_if_pending_migrations
Diffstat (limited to 'activerecord/lib/active_record')
-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 d168786e71..bd8024e143 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -159,7 +159,7 @@ db_namespace = namespace :db do
end
# desc "Raises an error if there are pending migrations"
- task :abort_if_pending_migrations => :environment do
+ task :abort_if_pending_migrations => [:environment, :load_config] do
pending_migrations = ActiveRecord::Migrator.open(ActiveRecord::Migrator.migrations_paths).pending_migrations
if pending_migrations.any?