From ffd073a49240263b25ef98867bea6cc261bf7909 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 25 Jan 2021 23:00:08 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-8-stable-ee --- config/initializers/1_settings.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index b3ea72fc7e5..bbed08f5044 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -12,6 +12,7 @@ Settings.encrypted_settings['path'] = Settings.absolute(Settings.encrypted_setti Settings['ldap'] ||= Settingslogic.new({}) Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil? +Settings.ldap['servers'] ||= Settingslogic.new({}) Settings.ldap['prevent_ldap_sign_in'] = false if Settings.ldap['prevent_ldap_sign_in'].blank? Settings.ldap['secret_file'] = Settings.absolute(Settings.ldap['secret_file'] || File.join(Settings.encrypted_settings['path'], "ldap.yaml.enc")) -- cgit v1.2.3