From 297b65e6b7c8b5ba00abd6cb2c4bf40d7efb5bd2 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Wed, 24 Apr 2019 22:40:46 -0700
Subject: Enable eager loading in CI

Deadlocks in feature specs may be worked around by enabling eager
loading. See https://github.com/rails/rails/issues/34310 for more
details.

Attempt to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/60953
---
 config/environments/test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/test.rb b/config/environments/test.rb
index 3461099253a..27dcc979fc6 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -40,7 +40,7 @@ Rails.application.configure do
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 
-  config.eager_load = false
+  config.eager_load = !!ENV['CI']
 
   config.cache_store = :null_store
 
-- 
cgit v1.2.3