summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-05-30 14:02:47 +0000
committerRémy Coutable <remy@rymai.me>2017-05-30 14:02:47 +0000
commite8d4685d1f472a058d14a1de8895be5f6400c2ed (patch)
tree525f4856f533cec1ac383fad587a1f2bb735cc82 /config
parente89d23ff6113c3ed71792d435bdaac08b2b9d57b (diff)
parent9a9ffa934422d0bc676096347417fc5bd1df287e (diff)
downloadgitlab-ce-e8d4685d1f472a058d14a1de8895be5f6400c2ed.tar.gz
Merge branch 'fix/gb/improve-active-record-test-extensions' into 'master'
Make `ActiveRecord::Migrator` idempotent again in test environment Closes #33030 See merge request !11762
Diffstat (limited to 'config')
-rw-r--r--config/initializers/ar_speed_up_migration_checking.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/ar_speed_up_migration_checking.rb b/config/initializers/ar_speed_up_migration_checking.rb
index 1fe5defc01d..aae774daa35 100644
--- a/config/initializers/ar_speed_up_migration_checking.rb
+++ b/config/initializers/ar_speed_up_migration_checking.rb
@@ -10,7 +10,7 @@ if Rails.env.test?
# it reads + parses `db/migrate/*` each time. Memoizing it can save 0.5
# seconds per spec.
def migrations(paths)
- @migrations ||= migrations_unmemoized(paths)
+ (@migrations ||= migrations_unmemoized(paths)).dup
end
end
end