summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMaxime Brugidou <m.brugidou@criteo.com>2013-12-09 11:06:12 +0100
committerMaxime Brugidou <m.brugidou@criteo.com>2013-12-09 11:06:12 +0100
commit2c4e3e001f2e3b22546d9a0288ca7d2d7121fff1 (patch)
tree098e19882f911ad5e40acbfc5db3e4381e2b6dcd /lib
parent31cdb7a405e5a3683b12a2ac7b4f195444552a96 (diff)
downloadgitlab-ce-2c4e3e001f2e3b22546d9a0288ca7d2d7121fff1.tar.gz
Skip email confirmation with LDAP
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/oauth/user.rb2
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?