diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-21 00:10:36 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-21 00:10:36 +0300 |
| commit | 3867f4726590bd73909adbc51a71f6399aa1b6dc (patch) | |
| tree | 603bd159fc15b9ddb9896aa1e01e38c8957b0990 /lib/gitlab/auth | |
| parent | bca3fb69e1e43c345ccac26a08ae1d374920020d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/auth')
| -rw-r--r-- | lib/gitlab/auth/o_auth/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/auth/o_auth/user.rb b/lib/gitlab/auth/o_auth/user.rb index 1c5ded2e8ed..feb5fea4c85 100644 --- a/lib/gitlab/auth/o_auth/user.rb +++ b/lib/gitlab/auth/o_auth/user.rb @@ -54,7 +54,7 @@ module Gitlab Users::UpdateService.new(gl_user, user: gl_user).execute! - gl_user.block if block_after_save + gl_user.block_pending_approval if block_after_save log.info "(#{provider}) saving user #{auth_hash.email} from login with admin => #{gl_user.admin}, extern_uid => #{auth_hash.uid}" gl_user |