summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-04-24 22:40:46 -0700
committerStan Hu <stanhu@gmail.com>2019-04-24 23:10:22 -0700
commit297b65e6b7c8b5ba00abd6cb2c4bf40d7efb5bd2 (patch)
treef4c29466110cc07930c2de5f30387ae604ae947c
parentf3b3d8b164933a0c8dd3ed505f1ff03a0910cd87 (diff)
downloadgitlab-ce-sh-eager-load-in-ci.tar.gz
Enable eager loading in CIsh-eager-load-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
-rw-r--r--config/environments/test.rb2
1 files changed, 1 insertions, 1 deletions
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