summaryrefslogtreecommitdiff
path: root/config/initializers
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2019-07-09 12:13:21 -0500
committerRobert Speicher <rspeicher@gmail.com>2019-07-09 12:13:21 -0500
commitdb04a18d7d8e77d52924e769044011824f7c6e3c (patch)
treeac7b61bfa9dfab614c363488a0d877ca761899d5 /config/initializers
parent6d3fede0af1de2106ec5779e33f0571f3e4261d2 (diff)
downloadgitlab-ce-db04a18d7d8e77d52924e769044011824f7c6e3c.tar.gz
CE-EE parity for shared config files
This copies over EE-specific changes to shared configuration files in CE.
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/ar_speed_up_migration_checking.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/ar_speed_up_migration_checking.rb b/config/initializers/ar_speed_up_migration_checking.rb
index aae774daa35..f98b246db0b 100644
--- a/config/initializers/ar_speed_up_migration_checking.rb
+++ b/config/initializers/ar_speed_up_migration_checking.rb
@@ -10,7 +10,8 @@ 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)).dup
+ @migrations ||= {}
+ (@migrations[paths] ||= migrations_unmemoized(paths)).dup
end
end
end