diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-03-01 18:14:53 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-03-01 18:14:53 +0000 |
| commit | 119cdf3b3b56aa3c237b070ffde856f09992a8a1 (patch) | |
| tree | 02e6cd5efb2a7f2f2247da0ca811ef70c54f40a9 /app/models/user.rb | |
| parent | 56e106d47f76c8692bfc2acdd018f5b2d11afd95 (diff) | |
| parent | bb41a889487463f626796a390148ae7870c16824 (diff) | |
| download | gitlab-ce-webpack-registry.tar.gz | |
Merge branch 'master' into 'webpack-registry'webpack-registry
# Conflicts:
# config/webpack.config.js
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 |