summaryrefslogtreecommitdiff
path: root/spec/spec_helper.rb
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-01-24 19:14:14 +0000
committerRobert Speicher <robert@gitlab.com>2017-01-24 19:14:14 +0000
commit94cc7cfad25f2c28bd4db8ca1fd39ece98c206b4 (patch)
tree04b1d6471e4c9f00419b7b8358b9f5b9e4a1a959 /spec/spec_helper.rb
parent8c9a06c37c4cf9763b3781d7e567a7b442c2152c (diff)
parent765d57d6505b7fbd2542ee957d85399ebc74ba70 (diff)
downloadgitlab-ce-94cc7cfad25f2c28bd4db8ca1fd39ece98c206b4.tar.gz
Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master'
Dont persist application settings in test env See merge request !8715
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'