Automatic merge of gitlab-org/gitlab-ce master

lib/gitlab/auth/o_auth/user.rb

@@ -48,7 +48,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}"