Merge branch 'master' of gitlab_gitlab:gitlab-org/gitlab-cerunner-metrics-extractor

1 files changed, 7 insertions, 10 deletions

diff --git a/config/initializers/ar_speed_up_migration_checking.rb b/config/initializers/ar_speed_up_migration_checking.rb
index f98b246db0b..c4ffcc54cb2 100644
--- a/config/initializers/ar_speed_up_migration_checking.rb
+++ b/config/initializers/ar_speed_up_migration_checking.rb
@@ -2,17 +2,14 @@ if Rails.env.test?
   require 'active_record/migration'
 
   module ActiveRecord
-    class Migrator
-      class << self
-        alias_method :migrations_unmemoized, :migrations
+    class MigrationContext
+      alias_method :migrations_unmemoized, :migrations
 
-        # This method is called a large number of times per rspec example, and
-        # it reads + parses `db/migrate/*` each time. Memoizing it can save 0.5
-        # seconds per spec.
-        def migrations(paths)
-          @migrations ||= {}
-          (@migrations[paths] ||= migrations_unmemoized(paths)).dup
-        end
+      # This method is called a large number of times per rspec example, and
+      # it reads + parses `db/migrate/*` each time. Memoizing it can save 0.5
+      # seconds per spec.
+      def migrations
+        @migrations ||= migrations_unmemoized
       end
     end
   end