summaryrefslogtreecommitdiff
path: root/config/environments
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-11-19 15:46:04 +0100
committerDouwe Maan <douwe@gitlab.com>2015-11-19 15:46:04 +0100
commitf5a630111fb1499a1541e77040529f74ca6475ec (patch)
treec3c82cd23d7bdcbfe4ec38d12be4572a6e8653ee /config/environments
parent28af56dea5a88ffcaceb082cf67c9c1ab021609d (diff)
parentc8074b6b115c95c68d5f7df300a391b4eab521d5 (diff)
downloadgitlab-ce-f5a630111fb1499a1541e77040529f74ca6475ec.tar.gz
Merge branch 'master' into reference-pipeline-and-caching
Diffstat (limited to 'config/environments')
-rw-r--r--config/environments/test.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/environments/test.rb b/config/environments/test.rb
index e03f54c5530..2ff1b83482f 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -32,4 +32,6 @@ Gitlab::Application.configure do
config.active_support.deprecation = :stderr
config.eager_load = false
+
+ config.cache_store = :null_store
end