diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-06 13:26:41 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-06 13:27:19 +0200 |
| commit | f2af30f19534c639c17fa5356ab1c18f518f2e98 (patch) | |
| tree | f7aa6556d235244308b9c0645c1bef189982fa40 /lib | |
| parent | 45ca39e81bf857cdb58b1a184b8fab0e56c200f7 (diff) | |
| download | gitlab-ce-f2af30f19534c639c17fa5356ab1c18f518f2e98.tar.gz | |
Skip email confirmation when set by admin or via LDAP.skip-email-reconfirmation
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ldap/user.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb index cfa8692659d..806f43c4694 100644 --- a/lib/gitlab/ldap/user.rb +++ b/lib/gitlab/ldap/user.rb @@ -39,6 +39,7 @@ module Gitlab end def update_user_attributes + gl_user.skip_reconfirmation! gl_user.email = auth_hash.email # Build new identity only if we dont have have same one |