diff options
| author | Horatiu Eugen Vlad <horatiu@vlad.eu> | 2018-02-23 15:10:39 +0300 |
|---|---|---|
| committer | Horatiu Eugen Vlad <horatiu@vlad.eu> | 2018-02-28 18:53:02 +0300 |
| commit | 1ad5df49b1925f1865e99c3fd8576a762aea9cae (patch) | |
| tree | b9cee2aabea4c4584883245ada7e8e91e1a01295 /lib/gitlab/auth.rb | |
| parent | 77097c9196da7c43d1102249da1d40446176f803 (diff) | |
Moved o_auth/saml/ldap modules under gitlab/auth
Diffstat (limited to 'lib/gitlab/auth.rb')
| -rw-r--r-- | lib/gitlab/auth.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb index 05932378173..86393ee254d 100644 --- a/lib/gitlab/auth.rb +++ b/lib/gitlab/auth.rb @@ -54,7 +54,7 @@ module Gitlab # LDAP users are only authenticated via LDAP if user.nil? || user.ldap_user? # Second chance - try LDAP authentication - Gitlab::LDAP::Authentication.login(login, password) + Gitlab::Auth::LDAP::Authentication.login(login, password) elsif Gitlab::CurrentSettings.password_authentication_enabled_for_git? user if user.active? && user.valid_password?(password) end @@ -85,7 +85,7 @@ module Gitlab private def authenticate_using_internal_or_ldap_password? - Gitlab::CurrentSettings.password_authentication_enabled_for_git? || Gitlab::LDAP::Config.enabled? + Gitlab::CurrentSettings.password_authentication_enabled_for_git? || Gitlab::Auth::LDAP::Config.enabled? end def service_request_check(login, password, project) |