diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-23 16:12:19 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-23 16:12:19 +0200 |
| commit | 2afe3a1210e6c444f9b92d59a02fcb3f474ae614 (patch) | |
| tree | 86034702043da254a0ad757e427f5c192e60750f /spec/fast_spec_helper.rb | |
| parent | 5b44097cf7a20a6bcdc38ac9ed43aac0ec33415e (diff) | |
| download | gitlab-ce-2afe3a1210e6c444f9b92d59a02fcb3f474ae614.tar.gz | |
Get rid of config/initializers/2_app.rb and define Gitlab in lib/gitlab.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/fast_spec_helper.rb')
| -rw-r--r-- | spec/fast_spec_helper.rb | 6 |
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' |