diff options
| author | Rubén Dávila <ruben@gitlab.com> | 2017-07-26 18:12:20 -0500 |
|---|---|---|
| committer | Rubén Dávila <ruben@gitlab.com> | 2017-07-27 08:45:16 -0500 |
| commit | ef97cb54ae3c62e8bc9062c7f32901520865d754 (patch) | |
| tree | c5dcd347bbc9ab20105984637433f089ab4ee9fc /app/controllers/sessions_controller.rb | |
| parent | 4eebd8e1957a3fc3a3479331fde9f34aa8afa9d5 (diff) | |
| download | gitlab-ce-ef97cb54ae3c62e8bc9062c7f32901520865d754.tar.gz | |
Backport some recent changes related to LDAP from EEbackport-2844-ldap-ee-license-checks
Diffstat (limited to 'app/controllers/sessions_controller.rb')
| -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 |