diff options
| author | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-10-14 13:11:53 +0200 |
|---|---|---|
| committer | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-10-14 13:13:59 +0200 |
| commit | 6ce65a3e950532e8fb65cf188eb5df9a6eddfb39 (patch) | |
| tree | ace2949d72914b88506691910b940588db0f2e81 /config/initializers/devise.rb | |
| parent | 9bf7bfda20a466b375a459b95068de8c0139fc9a (diff) | |
| download | gitlab-ce-6ce65a3e950532e8fb65cf188eb5df9a6eddfb39.tar.gz | |
Use Hash syntax for LDAP server declaration
Diffstat (limited to 'config/initializers/devise.rb')
| -rw-r--r-- | config/initializers/devise.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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'], |