summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-14 17:08:49 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-14 17:08:49 +0200
commitc43411e97aae85386ab50f9caf5ad8be481fb91c (patch)
tree6194ecac225e980b4b4920d33aaf68d4ca0238ae
parentbf7932bd06e45f82c7aa80373aa3aa1bf52d4d88 (diff)
downloadgitlab-ce-c43411e97aae85386ab50f9caf5ad8be481fb91c.tar.gz
Non-persisted users already have the identity by way of build_new_user.
-rw-r--r--lib/gitlab/ldap/user.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb
index d054014039a..d652e19217d 100644
--- a/lib/gitlab/ldap/user.rb
+++ b/lib/gitlab/ldap/user.rb
@@ -39,6 +39,8 @@ module Gitlab
end
def update_user_attributes
+ return unless persisted?
+
gl_user.skip_reconfirmation!
gl_user.email = auth_hash.email