aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-07-04 10:02:20 +0200
committerYves Senn <yves.senn@gmail.com>2013-07-04 10:09:12 +0200
commit6d554b263b8a31cf28383a140e631f4b537921ba (patch)
tree881c5a680e3372df8aa1009a2c196339c237a3bc /activerecord
parent715603794c965abe54569dd392b886d4dde61062 (diff)
downloadrails-6d554b263b8a31cf28383a140e631f4b537921ba.tar.gz
rails-6d554b263b8a31cf28383a140e631f4b537921ba.tar.bz2
rails-6d554b263b8a31cf28383a140e631f4b537921ba.zip
Remove deprecated block filter from `ActiveRecord::Migrator#migrate`.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md4
-rw-r--r--activerecord/lib/active_record/migration.rb10
2 files changed, 5 insertions, 9 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index a471b93f3c..ea40952be0 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Remove deprecated block filter from `ActiveRecord::Migrator#migrate`.
+
+ *Yves Senn*
+
* Remove deprecated String constructor from `ActiveRecord::Migrator`.
*Yves Senn*
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index d3f33b907a..248ce5753b 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -903,15 +903,7 @@ module ActiveRecord
raise UnknownMigrationVersionError.new(@target_version)
end
- running = runnable
-
- if block_given?
- message = "block argument to migrate is deprecated, please filter migrations before constructing the migrator"
- ActiveSupport::Deprecation.warn message
- running.select! { |m| yield m }
- end
-
- running.each do |migration|
+ runnable.each do |migration|
Base.logger.info "Migrating to #{migration.name} (#{migration.version})" if Base.logger
begin