From 6ce65a3e950532e8fb65cf188eb5df9a6eddfb39 Mon Sep 17 00:00:00 2001 From: Jan-Willem van der Meer Date: Tue, 14 Oct 2014 13:11:53 +0200 Subject: Use Hash syntax for LDAP server declaration --- config/initializers/devise.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/initializers/devise.rb') diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 7770f018a15..226cacfe0d1 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -205,14 +205,14 @@ Devise.setup do |config| # end if Gitlab.config.ldap.enabled - Gitlab.config.ldap.servers.each do |server| + Gitlab.config.ldap.servers.values.each do |server| if server['allow_username_or_email_login'] email_stripping_proc = ->(name) {name.gsub(/@.*$/,'')} else email_stripping_proc = ->(name) {name} end - config.omniauth server.provider_name, + config.omniauth server['provider_name'], host: server['host'], base: server['base'], uid: server['uid'], -- cgit v1.2.1