diff options
| author | Horatiu Eugen Vlad <horatiu@vlad.eu> | 2018-02-23 13:10:39 +0100 |
|---|---|---|
| committer | Horatiu Eugen Vlad <horatiu@vlad.eu> | 2018-02-28 16:53:02 +0100 |
| commit | 1ad5df49b1925f1865e99c3fd8576a762aea9cae (patch) | |
| tree | b9cee2aabea4c4584883245ada7e8e91e1a01295 /app/models/user.rb | |
| parent | 77097c9196da7c43d1102249da1d40446176f803 (diff) | |
| download | gitlab-ce-1ad5df49b1925f1865e99c3fd8576a762aea9cae.tar.gz | |
Moved o_auth/saml/ldap modules under gitlab/auth
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 8610ca27b7f..8e881e53706 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -728,7 +728,7 @@ class User < ActiveRecord::Base def ldap_user? if identities.loaded? - identities.find { |identity| Gitlab::OAuth::Provider.ldap_provider?(identity.provider) && !identity.extern_uid.nil? } + identities.find { |identity| Gitlab::Auth::OAuth::Provider.ldap_provider?(identity.provider) && !identity.extern_uid.nil? } else identities.exists?(["provider LIKE ? AND extern_uid IS NOT NULL", "ldap%"]) end |