diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-25 23:00:08 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-25 23:00:08 +0000 |
| commit | ffd073a49240263b25ef98867bea6cc261bf7909 (patch) | |
| tree | c43de093fdcd39657e5782c5ce1be79622b74fd8 /config | |
| parent | 0ce33bd2eaa8fe22ad59d7c198bb700f80503db9 (diff) | |
| download | gitlab-ce-ffd073a49240263b25ef98867bea6cc261bf7909.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-8-stable-ee
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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")) |