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/identity.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/identity.rb')
| -rw-r--r-- | app/models/identity.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/identity.rb b/app/models/identity.rb index 2b433e9b988..1011b9f1109 100644 --- a/app/models/identity.rb +++ b/app/models/identity.rb @@ -17,12 +17,12 @@ class Identity < ActiveRecord::Base end def ldap? - Gitlab::OAuth::Provider.ldap_provider?(provider) + Gitlab::Auth::OAuth::Provider.ldap_provider?(provider) end def self.normalize_uid(provider, uid) - if Gitlab::OAuth::Provider.ldap_provider?(provider) - Gitlab::LDAP::Person.normalize_dn(uid) + if Gitlab::Auth::OAuth::Provider.ldap_provider?(provider) + Gitlab::Auth::LDAP::Person.normalize_dn(uid) else uid.to_s end |