Commit e4465376 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #5798 from criteo/skip_confirmation

Skip email confirmation with LDAP
parents 1ab91d88 2c4e3e00
...@@ -28,8 +28,8 @@ module Gitlab ...@@ -28,8 +28,8 @@ module Gitlab
} }
user = model.build_user(opts, as: :admin) user = model.build_user(opts, as: :admin)
user.skip_confirmation!
user.save! user.save!
user.confirm!
log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}" log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}"
if Gitlab.config.omniauth['block_auto_created_users'] && !ldap? if Gitlab.config.omniauth['block_auto_created_users'] && !ldap?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment