summaryrefslogtreecommitdiff
path: root/spec/spec_helper.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2017-01-21 22:55:35 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2017-01-21 22:55:35 +0000
commitbaeaa97ef49558a303b0bd7b6cc9ce4ccfc13d1d (patch)
treec009601bc21af2f88f0d246427d5fbe3db5e5bb2 /spec/spec_helper.rb
parentf6f52b43b59641f5e0c6f7aa47b1354ca3aeee32 (diff)
downloadgitlab-ce-baeaa97ef49558a303b0bd7b6cc9ce4ccfc13d1d.tar.gz
Revert "Merge branch 'dont-persist-application-settings-in-test-env' into 'master'"
This reverts merge request !8573
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f78899134d5..6ee3307512d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,7 +2,6 @@ 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'