diff options
| author | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-10-15 09:53:16 +0200 |
|---|---|---|
| committer | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-10-15 09:53:16 +0200 |
| commit | dcf6c26075027c56e733da7db06e5e355b40074e (patch) | |
| tree | 3abdd7a389386e18aa983722a611224c18d87eec /config/initializers/devise.rb | |
| parent | e3bd17a7ba5238c147a79d0770e8503fd913610c (diff) | |
| download | gitlab-ce-dcf6c26075027c56e733da7db06e5e355b40074e.tar.gz | |
Only enable LDAP providers if LDAP is enabled
Diffstat (limited to 'config/initializers/devise.rb')
| -rw-r--r-- | config/initializers/devise.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 226cacfe0d1..c6eb3e51036 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -204,7 +204,7 @@ Devise.setup do |config| # manager.default_strategies(scope: :user).unshift :some_external_strategy # end - if Gitlab.config.ldap.enabled + if Gitlab::LDAP::Config.enabled? Gitlab.config.ldap.servers.values.each do |server| if server['allow_username_or_email_login'] email_stripping_proc = ->(name) {name.gsub(/@.*$/,'')} |