yystopf
/
forgeplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX merge

This commit is contained in:
Jasder 2021-01-13 14:42:26 +08:00
parent 37be604e82 83e2c1f889
commit 987ff74690
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/pull_requests/show.json.jbuilder
View File

@ -1,6 +1,7 @@
json.partial! "commons/success" json.partial! "commons/success"
json.project_name @project.name json.project_name @project.name
json.identifier @project.identifier json.identifier @project.identifier
json.project_identifier @project.identifier
json.pr_time time_from_now(@pull_request.updated_at) json.pr_time time_from_now(@pull_request.updated_at)
json.commits_count @pull_request.commits_count json.commits_count @pull_request.commits_count
json.files_count @pull_request.files_count json.files_count @pull_request.files_count
@ -10,6 +11,7 @@ json.pull_request do
json.extract! @pull_request, :id,:base, :head, :status,:fork_project_id, :is_original json.extract! @pull_request, :id,:base, :head, :status,:fork_project_id, :is_original
json.pull_request_staus @pull_request.status == 1 ? "merged" : (@pull_request.status == 2 ? "closed" : "open") json.pull_request_staus @pull_request.status == 1 ? "merged" : (@pull_request.status == 2 ? "closed" : "open")
json.fork_project_user @pull_request&.fork_project&.owner.try(:login) json.fork_project_user @pull_request&.fork_project&.owner.try(:login)
json.create_user @pull_request&.user&.login
end end
json.issue do json.issue do