Merge commit 'rails/master'

Conflicts:

	activerecord/lib/active_record/base.rb
	activerecord/lib/active_record/migration.rb
	activerecord/test/cases/helper.rb

1 files changed, 5 insertions, 5 deletions

diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index ce02fe019f..557ab07abf 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -508,11 +508,11 @@ module ActiveRecord
             raise DuplicateMigrationNameError.new(name.camelize)
           end
 
-          klasses << returning(MigrationProxy.new) do |migration|
-            migration.name     = name.camelize
-            migration.version  = version
-            migration.filename = file
-          end
+          migration = MigrationProxy.new
+          migration.name     = name.camelize
+          migration.version  = version
+          migration.filename = file
+          klasses << migration
         end
 
         migrations = migrations.sort_by(&:version)