mirror of
https://gitlink.org.cn/Gitlink/forgeplus.git
synced 2026-05-08 14:11:42 +08:00
Merge branch 'standalone_develop' into pre_trustie_server
This commit is contained in:
@@ -26,4 +26,4 @@ json.super_description @user.super_description
|
||||
json.(@user, :show_email, :show_department, :show_location, :show_super_description)
|
||||
json.message_unread_total @message_unread_total
|
||||
json.has_trace_user @user.trace_user.present?
|
||||
json.is_new params[:login].to_s.include?("#{@user.login}")
|
||||
json.is_new @user.login.present? && params[:login].to_s.include?("#{@user.login}")
|
||||
Reference in New Issue
Block a user