Merge pull request #5798 from criteo/skip_confirmation

Skip email confirmation with LDAP

Merge pull request #5798 from criteo/skip_confirmation
Skip email confirmation with LDAP
e4465376 · Dmitriy Zaporozhets · 1ab91d88 · 2c4e3e00 · e4465376
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

lib/gitlab/oauth/user.rb lib/gitlab/oauth/user.rb +1 -1

未找到文件。
--- 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?