diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-07-28 12:13:50 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-07-28 12:13:50 +0300 |
commit | da3100254f446bcb1f27516606f25d92893f81b8 (patch) | |
tree | 1c6346cfd7b0ad057b722b6f694bfd738b5b3fbc /app | |
parent | 190fae5f0cef11d68c7385be0c4013931796f958 (diff) | |
parent | ef97cb54ae3c62e8bc9062c7f32901520865d754 (diff) |
Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'
Backport some recent changes related to LDAP from EE
See merge request !13119
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/sessions_controller.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 69513f4dadc..9e743685d60 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -23,12 +23,7 @@ class SessionsController < Devise::SessionsController def new set_minimum_password_length - @ldap_servers = - if Gitlab.config.ldap.enabled - Gitlab::LDAP::Config.servers - else - [] - end + @ldap_servers = Gitlab::LDAP::Config.available_servers super end |