Do not preload settings

This commit is contained in:
Kamil Trzciński 2018-04-24 16:43:41 +02:00
parent 17ffd99873
commit 575302c1b9
5 changed files with 4 additions and 3 deletions

View file

@ -1,4 +1,4 @@
require_dependency File.expand_path('../../lib/gitlab', __dir__) # Load Gitlab as soon as possible
require_relative '../settings'
# Default settings
Settings['ldap'] ||= Settingslogic.new({})

View file

@ -0,0 +1 @@
require_relative '../../lib/gitlab'

View file

@ -1,4 +1,3 @@
require_dependency 'settings'
require_dependency 'gitlab/popen'
module Gitlab

View file

@ -9,7 +9,8 @@ unless Object.respond_to?(:require_dependency)
end
end
# Defines Gitlab and Gitlab.config which are at the center of the app
# Defines Settings and Gitlab.config which are at the center of the app
require_relative '../config/settings'
require_relative '../lib/gitlab' unless defined?(Gitlab.config)
require_relative 'support/rspec'