diff options
author | Yves Senn <yves.senn@gmail.com> | 2015-09-07 16:13:47 +0200 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2015-09-07 16:23:42 +0200 |
commit | 8e155b0a9a4e387639be47d11e3a69c53ffb23ed (patch) | |
tree | a288ea7f6f16b5bceac781d1903c80f377f0fb33 /activerecord/lib | |
parent | 488afd5cc3a0d303b4b318938f2a13942d37d926 (diff) | |
parent | 73726340c37f89ce8a58df0f8cec191b7e0dd067 (diff) | |
download | rails-8e155b0a9a4e387639be47d11e3a69c53ffb23ed.tar.gz rails-8e155b0a9a4e387639be47d11e3a69c53ffb23ed.tar.bz2 rails-8e155b0a9a4e387639be47d11e3a69c53ffb23ed.zip |
Merge pull request #21527 from rngtng/fix-migrator-path-setup
Use global migrations_path configuration in Migrator
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/tasks/database_tasks.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb index 683741768b..0b5dc6ed33 100644 --- a/activerecord/lib/active_record/tasks/database_tasks.rb +++ b/activerecord/lib/active_record/tasks/database_tasks.rb @@ -134,7 +134,7 @@ module ActiveRecord version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil scope = ENV['SCOPE'] verbose_was, Migration.verbose = Migration.verbose, verbose - Migrator.migrate(Migrator.migrations_paths, version) do |migration| + Migrator.migrate(migrations_paths, version) do |migration| scope.blank? || scope == migration.scope end ensure |