mirror of
https://gitlink.org.cn/Gitlink/forgeplus.git
synced 2026-05-22 20:55:46 +08:00
Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
user = project.owner
|
user = project.owner
|
||||||
if user.blank?
|
if user.blank?
|
||||||
nil
|
nil
|
||||||
else
|
else
|
||||||
json.id project.id
|
json.id project.id
|
||||||
json.repo_id project&.repository&.id
|
json.repo_id project&.repository&.id
|
||||||
json.identifier project.identifier
|
json.identifier project.identifier
|
||||||
@@ -16,6 +16,7 @@ json.type project&.numerical_for_project_type
|
|||||||
json.last_update_time render_unix_time(project.updated_on)
|
json.last_update_time render_unix_time(project.updated_on)
|
||||||
json.time_ago time_from_now(project.updated_on)
|
json.time_ago time_from_now(project.updated_on)
|
||||||
json.forked_from_project_id project.forked_from_project_id
|
json.forked_from_project_id project.forked_from_project_id
|
||||||
|
json.type @project.numerical_for_project_type
|
||||||
json.author do
|
json.author do
|
||||||
json.name user.try(:show_real_name)
|
json.name user.try(:show_real_name)
|
||||||
json.login user.login
|
json.login user.login
|
||||||
|
|||||||
Reference in New Issue
Block a user