summaryrefslogtreecommitdiff
path: root/app/models/identity.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-12-13 18:02:49 +0100
committerDouwe Maan <douwe@selenight.nl>2017-12-15 12:48:48 +0100
commit481b8a71f8ee63758d26a57a6367c091d4b76b09 (patch)
tree1dad8e2612bdce00ca3b537db648bcd54785a95a /app/models/identity.rb
parentd673628de003d1ce1402f03311066339828fb811 (diff)
downloadgitlab-ce-481b8a71f8ee63758d26a57a6367c091d4b76b09.tar.gz
Make sure user email is read only when synced with LDAP
Diffstat (limited to 'app/models/identity.rb')
-rw-r--r--app/models/identity.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/identity.rb b/app/models/identity.rb
index ff811e19f8a..99d99bc6deb 100644
--- a/app/models/identity.rb
+++ b/app/models/identity.rb
@@ -14,11 +14,11 @@ class Identity < ActiveRecord::Base
end
def ldap?
- provider.starts_with?('ldap')
+ Gitlab::OAuth::Provider.ldap_provider?(provider)
end
def self.normalize_uid(provider, uid)
- if provider.to_s.starts_with?('ldap')
+ if Gitlab::OAuth::Provider.ldap_provider?(provider)
Gitlab::LDAP::Person.normalize_dn(uid)
else
uid.to_s