Commit e44653764a4c700783d2ff32d36558acc52581f1
Exists in
master
and in
4 other branches
Merge pull request #5798 from criteo/skip_confirmation
Skip email confirmation with LDAP
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
lib/gitlab/oauth/user.rb
| @@ -28,8 +28,8 @@ module Gitlab | @@ -28,8 +28,8 @@ module Gitlab | ||
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | user = model.build_user(opts, as: :admin) | 30 | user = model.build_user(opts, as: :admin) |
| 31 | + user.skip_confirmation! | ||
| 31 | user.save! | 32 | user.save! |
| 32 | - user.confirm! | ||
| 33 | log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}" | 33 | log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}" |
| 34 | 34 | ||
| 35 | if Gitlab.config.omniauth['block_auto_created_users'] && !ldap? | 35 | if Gitlab.config.omniauth['block_auto_created_users'] && !ldap? |