Commit 772b6b08 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'fix-settings-preloading' into 'master'

Do not preload settings

See merge request gitlab-org/gitlab-ce!18566
parents ab7b01aa 575302c1
require_dependency File.expand_path('../../lib/gitlab', __dir__) # Load Gitlab as soon as possible
require_relative '../settings'
# Default settings
Settings['ldap'] ||= Settingslogic.new({})
......
require_relative '../../lib/gitlab'
require_dependency 'settings'
require_dependency 'gitlab/popen'
module Gitlab
......
......@@ -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'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment