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

merge from develop

Browse Source
This commit is contained in:
yystopf
2022-07-26 14:22:18 +08:00
parent b1809909db cc09f724cc
commit 70220638fd
4 changed files with 911 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder
View File

@@ -18,8 +18,8 @@ json.issue do
end
json.priority issue&.priority.try(:name)
json.version issue&.version.try(:name)
json.comments_count issue.journals.count
json.journals_count issue.journals.count
json.issue_tags issue.get_issue_tags
end
json.comments_count pull.journals.count
json.journals_count pull.journals.count

3
app/views/api/v1/projects/pulls/show.json.jbuilder
View File

@@ -26,4 +26,5 @@ json.last_review do
else
json.nil!
end
end
end
json.conflict_files @pull_request.conflict_files