Commit 7d110492 authored by Stan Hu's avatar Stan Hu

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
parents 5cc49c16 157b3854
...@@ -46,7 +46,7 @@ def save(provider = 'OAuth') ...@@ -46,7 +46,7 @@ def save(provider = 'OAuth')
gl_user.block if block_after_save 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 gl_user
rescue ActiveRecord::RecordInvalid => e rescue ActiveRecord::RecordInvalid => e
log.info "(#{provider}) Error saving user #{auth_hash.uid} (#{auth_hash.email}): #{gl_user.errors.full_messages}" log.info "(#{provider}) Error saving user #{auth_hash.uid} (#{auth_hash.email}): #{gl_user.errors.full_messages}"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment