diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-01-24 08:20:18 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-01-24 08:20:18 +0300 |
| commit | 7d11049237cca35307b996dcec683693794c831a (patch) | |
| tree | 0fed4f6d007cbf0ccaa4b1222963282b569b319e | |
| parent | 5cc49c16b8446d66a5176e208e9ca834aab746ba (diff) | |
| parent | 157b385411bcbf0191108f7ce0e99cb3fe3baaef (diff) | |
Merge branch 'if-log_user_admin_status' into 'master'
Log admin status of user when OAuth::User is saved
See merge request gitlab-org/gitlab-ce!24602
| -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 a4e8a41b246..f38c5d57c44 100644 --- a/lib/gitlab/auth/o_auth/user.rb +++ b/lib/gitlab/auth/o_auth/user.rb @@ -46,7 +46,7 @@ module Gitlab gl_user.block if block_after_save - log.info "(#{provider}) saving user #{auth_hash.email} from login with extern_uid => #{auth_hash.uid}" + log.info "(#{provider}) saving user #{auth_hash.email} from login with admin => #{gl_user.admin}, extern_uid => #{auth_hash.uid}" gl_user rescue ActiveRecord::RecordInvalid => e log.info "(#{provider}) Error saving user #{auth_hash.uid} (#{auth_hash.email}): #{gl_user.errors.full_messages}" |