Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie
This commit is contained in:
commit
bfdba8ee64
|
@ -1,7 +1,7 @@
|
|||
user = project.owner
|
||||
if user.blank?
|
||||
nil
|
||||
else
|
||||
else
|
||||
json.id project.id
|
||||
json.repo_id project&.repository&.id
|
||||
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.time_ago time_from_now(project.updated_on)
|
||||
json.forked_from_project_id project.forked_from_project_id
|
||||
json.type @project.numerical_for_project_type
|
||||
json.author do
|
||||
json.name user.try(:show_real_name)
|
||||
json.login user.login
|
||||
|
|
Loading…
Reference in New Issue