diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-15 09:21:26 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-15 09:21:26 +0000 |
commit | 9f9be175e0cd39c36f1c195f4334ce7491b09c32 (patch) | |
tree | 4d51b87e1520b5b1317f88299b8f9c85317691ea /lib | |
parent | db7d15497082656bb60e43821529d07c38111a1b (diff) | |
parent | f4d68f398f2ed176df97a9870f5d634bd5c06e0c (diff) | |
download | gitlab-ce-9f9be175e0cd39c36f1c195f4334ce7491b09c32.tar.gz |
Merge branch 'feature/confirmable' of /home/git/repositories/gitlab/gitlabhq
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/oauth/user.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/oauth/user.rb b/lib/gitlab/oauth/user.rb index 1b32b99f4ba..ea9badba2c3 100644 --- a/lib/gitlab/oauth/user.rb +++ b/lib/gitlab/oauth/user.rb @@ -29,6 +29,7 @@ module Gitlab user = model.build_user(opts, as: :admin) 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? |