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

Merge pull request 'merge develop to standalone_develop' (#267) from develop into standalone_develop

Browse Source
This commit is contained in:
xxq250
2021-11-26 14:21:53 +08:00
parent 1eb1d25040 7ebd8681fa
commit 7c765817c9
44 changed files with 735 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/views/projects/applied_transfer_projects/_detail.json.jbuilder
View File

@@ -1,13 +1,17 @@
project = object.project
json.project do
json.id project.id
json.identifier project.identifier
json.name project.name
json.description project.description
json.is_public project.is_public
json.owner do
json.partial! "/users/user_simple", locals: {user: project.owner}
if project.present?
json.project do
json.id project.id
json.identifier project.identifier
json.name project.name
json.description project.description
json.is_public project.is_public
json.owner do
json.partial! "/users/user_simple", locals: {user: project.owner}
end
end
else
json.project nil
end
json.user do
json.partial! "/users/user_simple", locals: {user: object.user}

1
app/views/pull_requests/index.json.jbuilder
View File

@@ -14,6 +14,7 @@ json.issues do
json.array! @issues.to_a do |issue|
pr = issue.pull_request
json.pull_request_id pr.id
json.pull_request_number pr.gitea_number
json.pull_request_status pr.status
json.pull_request_head pr.head
json.pull_request_base pr.base