diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:39 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:39 +0300 |
commit | dc889678d1de8c09310b2f8f9742bb6c78a6f1a4 (patch) | |
tree | 70945aa6721a271fc8057efa13c3216a03fbac45 /lib/gitlab/auth.rb | |
parent | cd52759ee33051b8ad7b88b02ba7954e4fad7018 (diff) |
Add latest changes from gitlab-org/gitlab@master
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 1329357d0b8..c16c2ce96de 100644 --- a/lib/gitlab/auth.rb +++ b/lib/gitlab/auth.rb @@ -88,7 +88,7 @@ module Gitlab else # If no user is provided, try LDAP. # LDAP users are only authenticated via LDAP - authenticators << Gitlab::Auth::LDAP::Authentication + authenticators << Gitlab::Auth::Ldap::Authentication end authenticators.compact! @@ -134,7 +134,7 @@ module Gitlab end def authenticate_using_internal_or_ldap_password? - Gitlab::CurrentSettings.password_authentication_enabled_for_git? || Gitlab::Auth::LDAP::Config.enabled? + Gitlab::CurrentSettings.password_authentication_enabled_for_git? || Gitlab::Auth::Ldap::Config.enabled? end def service_request_check(login, password, project) |