diff options
| author | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-10-17 18:08:26 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-20 16:38:08 +0300 |
| commit | 3d3726a026f465a441abd7438de85790d9d84d94 (patch) | |
| tree | 31cae9ca9bf13a1477602091b9fe7befeb2fc85d | |
| parent | 49bd9812000626af71c1b7b00d9f998fcaca2a46 (diff) | |
| download | gitlab-ce-3d3726a026f465a441abd7438de85790d9d84d94.tar.gz | |
Default the LDAP server label to LDAP
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 7e7c91ced77..88cbaefea7d 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -61,7 +61,6 @@ Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil? if Settings.ldap['enabled'] || Rails.env.test? if Settings.ldap['host'].present? server = Settings.ldap.except('sync_time') - server['label'] = 'LDAP' server['provider_name'] = 'ldap' Settings.ldap['servers'] = { 'ldap' => server @@ -69,6 +68,7 @@ if Settings.ldap['enabled'] || Rails.env.test? end Settings.ldap['servers'].each do |key, server| + server['label'] ||= 'LDAP' server['allow_username_or_email_login'] = false if server['allow_username_or_email_login'].nil? server['active_directory'] = true if server['active_directory'].nil? server['provider_name'] ||= "ldap#{key}".downcase |