diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-03-01 20:47:01 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-03-01 20:47:01 +0300 |
commit | 11d275e24a49a5ae2c844b099cfddc7054178830 (patch) | |
tree | c378fb9dc9d6d5793870506c34915b9aa789a589 /app/models/user.rb | |
parent | 008120f8db90dcf65fdd00343a4d8a22695abed1 (diff) | |
parent | 1ad5df49b1925f1865e99c3fd8576a762aea9cae (diff) |
Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master'
Moved o_auth/saml/ldap modules under gitlab/auth
See merge request gitlab-org/gitlab-ce!17359
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 982080763d2..9547506d33d 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 |