floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'standalone_develop' into pre_trustie_server

This commit is contained in:
xiaoxiaoqiong 2022-05-24 15:24:43 +08:00
parent 0219a1fdde 94166a363c
commit 774b1bc79e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/users/get_user_info.json.jbuilder
View File

@ -26,4 +26,4 @@ json.super_description @user.super_description
json.(@user, :show_email, :show_department, :show_location, :show_super_description) json.(@user, :show_email, :show_department, :show_location, :show_super_description)
json.message_unread_total @message_unread_total json.message_unread_total @message_unread_total
json.has_trace_user @user.trace_user.present? 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}")