summaryrefslogtreecommitdiff
path: root/spec/fast_spec_helper.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/fast_spec_helper.rb')
-rw-r--r--spec/fast_spec_helper.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb
index 105f70246c9..f28268b0754 100644
--- a/spec/fast_spec_helper.rb
+++ b/spec/fast_spec_helper.rb
@@ -1,7 +1,6 @@
require 'bundler/setup'
ENV['GITLAB_ENV'] = 'test'
-ENV['RAILS_ENV'] = 'test'
ENV['IN_MEMORY_APPLICATION_SETTINGS'] = 'true'
unless Object.respond_to?(:require_dependency)
@@ -11,9 +10,6 @@ unless Object.respond_to?(:require_dependency)
end
# Defines Gitlab and Gitlab.config which are at the center of the app
-unless defined?(Gitlab.config)
- require_relative '../lib/settings'
- require_relative '../config/initializers/2_app'
-end
+require_relative '../lib/gitlab' unless defined?(Gitlab.config)
require_relative 'support/rspec'