floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-21 20:25:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into standalone_develop

Browse Source
This commit is contained in:
yystopf
2022-04-28 10:54:02 +08:00
parent e1b4622ede 793cbb372a
commit 1d7c7eba24
6 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,5 +22,6 @@ json.province @user.province
json.city @user.city
json.custom_department @user.custom_department
json.description @user.description
json.(@user, :show_email, :show_department, :show_location)
json.super_description @user.super_description
json.(@user, :show_email, :show_department, :show_location, :show_super_description)
json.message_unread_total @message_unread_total