diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-10 01:43:38 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-10 01:43:38 -0800 |
| commit | e44653764a4c700783d2ff32d36558acc52581f1 (patch) | |
| tree | 60c75e3141e9d16d521dc8cc2455b18a699b74e8 /lib | |
| parent | 1ab91d889d4ef149d5a9da772764c9bf07d81768 (diff) | |
| parent | 2c4e3e001f2e3b22546d9a0288ca7d2d7121fff1 (diff) | |
| download | gitlab-ce-e44653764a4c700783d2ff32d36558acc52581f1.tar.gz | |
Merge pull request #5798 from criteo/skip_confirmation
Skip email confirmation with LDAP
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/oauth/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/oauth/user.rb b/lib/gitlab/oauth/user.rb index ea9badba2c3..529753c4019 100644 --- a/lib/gitlab/oauth/user.rb +++ b/lib/gitlab/oauth/user.rb @@ -28,8 +28,8 @@ module Gitlab } user = model.build_user(opts, as: :admin) + user.skip_confirmation! user.save! - user.confirm! log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}" if Gitlab.config.omniauth['block_auto_created_users'] && !ldap? |