diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-14 12:08:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-14 12:08:52 +0300 |
| commit | 6aa920eeb4ef61ea7e7c77b5e10595507874b927 (patch) | |
| tree | babdd955f22707b9196543ab9e85af3e140a57f6 /lib/gitlab/auth | |
| parent | 1943b0a274de377e0d3e212d3d4d1bfcf58d3690 (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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/gitlab/auth/o_auth/user.rb b/lib/gitlab/auth/o_auth/user.rb index 8b114d6d5d8..200f1a843e6 100644 --- a/lib/gitlab/auth/o_auth/user.rb +++ b/lib/gitlab/auth/o_auth/user.rb @@ -55,6 +55,7 @@ module Gitlab Users::UpdateService.new(gl_user, user: gl_user).execute! gl_user.block_pending_approval if block_after_save + activate_user_if_user_cap_not_reached log.info "(#{provider}) saving user #{auth_hash.email} from login with admin => #{gl_user.admin}, extern_uid => #{auth_hash.uid}" gl_user @@ -102,6 +103,10 @@ module Gitlab protected + def activate_user_if_user_cap_not_reached + nil + end + def should_save? true end |