summaryrefslogtreecommitdiff
path: root/spec/spec_helper.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2017-01-22 00:11:19 +0000
committerRémy Coutable <remy@rymai.me>2017-01-23 16:35:24 +0100
commit632c2939bb1e9d10b5e9be05bc4692d92f9f5f32 (patch)
treeb56bf9a5fb3665fc38cdf5fa0b1e5739983a3bdb /spec/spec_helper.rb
parent6c65f7a7ce52fadcf53ea2395103de32b0107874 (diff)
downloadgitlab-ce-632c2939bb1e9d10b5e9be05bc4692d92f9f5f32.tar.gz
Revert "Merge branch 'revert-9cac0317' into 'master' "
This reverts commit c20934869f7dc8cfbdbafb6ecb7b1305452c9e8a, reversing changes made to 4b7ec44b91e0571d209c790d54947ba1756dac0e.
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6ee3307512d..f78899134d5 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,6 +2,7 @@ require './spec/simplecov_env'
SimpleCovEnv.start!
ENV["RAILS_ENV"] ||= 'test'
+ENV["IN_MEMORY_APPLICATION_SETTINGS"] = 'true'
require File.expand_path("../../config/environment", __FILE__)
require 'rspec/rails'