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

Do not preload settings

See merge request gitlab-org/gitlab-ce!18566

config/initializers/1_settings.rb

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

config/initializers/2_gitlab.rb

+require_relative '../../lib/gitlab'

lib/gitlab.rb

-require_dependency 'settings'
 require_dependency 'gitlab/popen'
 
 module Gitlab

spec/fast_spec_helper.rb

@@ -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'