diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-13 13:44:56 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-13 13:44:56 +0000 |
| commit | 6e88d9335b85a62b9054b7e004d78be658c48d23 (patch) | |
| tree | 0498ca897ca3fb1a740ad51556e76a025414fac9 /lib | |
| parent | 7f04a4174ed4c6627e78c4dabae152fa0f264853 (diff) | |
| parent | f2af30f19534c639c17fa5356ab1c18f518f2e98 (diff) | |
| download | gitlab-ce-6e88d9335b85a62b9054b7e004d78be658c48d23.tar.gz | |
Merge branch 'skip-email-reconfirmation' into 'master'
Skip email confirmation when set by admin or via LDAP.
Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2203.
See merge request !494
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 b04f5b4ac37..72de7b3a8d6 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 |