home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity

Ensure each server block is a settingsLocic object

Browse Source
This commit is contained in:
Jan-Willem van der Meer
2014-10-16 10:32:29 +02:00
parent 09ccea3590
commit 18d87dcf91
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/initializers/1_settings.rb
+4 -1
View File
@@ -61,6 +61,7 @@ Settings.ldap['sync_time'] = 3600 if Settings.ldap['sync_time'].nil?
if Settings.ldap['enabled'] || Rails.env.test?
if Settings.ldap['host'].present?
server = Settings.ldap.except('sync_time')
server = Settingslogic.new(server)
server['label'] = 'LDAP'
server['provider_name'] = 'ldap'
Settings.ldap['servers'] = {
@@ -68,12 +69,14 @@ if Settings.ldap['enabled'] || Rails.env.test?
}
end
Settings.ldap['servers'].each do |key, server|
Settings.ldap['servers'].map do |key, server|
server = Settingslogic.new(server)
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
server['sync_time'] = 3600 if server['sync_time'].nil?
server['provider_class'] = OmniAuth::Utils.camelize(server['provider_name'])
Settings.ldap['servers'][key] = server
end
end