summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-10-15 09:59:58 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-10-15 09:59:58 +0300
commit2e8b0fa5cf9e70c55bd1dbb254db3f9aa45b23e9 (patch)
tree8dc84b44f18a23ea55249b9425d454541dd77979 /lib
parent6fff92e984c8977bb1b8d5424e8b81796e2ccb07 (diff)
downloadgitlab-ce-2e8b0fa5cf9e70c55bd1dbb254db3f9aa45b23e9.tar.gz
Oauth users and users created by admin should be confirmed immediatly
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/oauth/user.rb1
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?