diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-10 12:09:18 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-10 12:09:18 +0200 |
| commit | 16697f6efa4653986753905ab9100fa11dde7f09 (patch) | |
| tree | 8186f4ff4b90ac4c34ec22727b764f562d997f8d /lib | |
| parent | 6a90378daedcba7efc167cdfa0e1ac7306809391 (diff) | |
| parent | 27900efb972b84b1a31f2a92cbc9272073a94338 (diff) | |
| download | gitlab-ce-16697f6efa4653986753905ab9100fa11dde7f09.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
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? |