diff options
Diffstat (limited to 'config/initializers/1_settings.rb')
| -rw-r--r-- | config/initializers/1_settings.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 9cb1be45b68..35931a3caaa 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -27,7 +27,6 @@ end # backwards compatibility, we only have one host if Settings.ldap['enabled'] || Rails.env.test? - Settings.ldap['sync_name'] = true if Settings.ldap['sync_name'].nil? if Settings.ldap['host'].present? # We detected old LDAP configuration syntax. Update the config to make it # look like it was entered with the new syntax. @@ -68,6 +67,8 @@ if Settings.ldap['enabled'] || Rails.env.test? # `ssl_version` in favor of `tls_options` hash option. server['tls_options'] ||= {} + server['sync_name'] = true if server['sync_name'].nil? + if server['ssl_version'] || server['ca_file'] Gitlab::AppLogger.warn 'DEPRECATED: LDAP options `ssl_version` and `ca_file` should be nested within `tls_options`' end |