From 2b307c28407c77cde20f79c7be0bafcd9611d6ea Mon Sep 17 00:00:00 2001 From: fsafasff <2624934035@qq.com> Date: Fri, 29 May 2026 11:37:17 +0800 Subject: [PATCH] fix: expose pull request finished times --- app/views/pull_requests/_detail.json.jbuilder | 4 +++- app/views/pull_requests/index.json.jbuilder | 2 ++ app/views/pull_requests/show.json.jbuilder | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/views/pull_requests/_detail.json.jbuilder b/app/views/pull_requests/_detail.json.jbuilder index 814c078ef..a22364e24 100644 --- a/app/views/pull_requests/_detail.json.jbuilder +++ b/app/views/pull_requests/_detail.json.jbuilder @@ -9,6 +9,8 @@ json.is_original pr.is_original json.fork_project_id pr&.fork_project_id json.fork_project_identifier pr&.fork_project&.identifier json.fork_project_user pr&.fork_project&.owner.try(:login) +json.merged_at pr.status == PullRequest::MERGED ? format_time(pr.updated_at) : "" +json.closed_at pr.status == PullRequest::CLOSED ? format_time(pr.updated_at) : "" json.reviewers pr&.reviewers.pluck(:login) json.id issue.id @@ -22,4 +24,4 @@ json.avatar_url url_to_avatar(issue.user) json.priority issue.priority.try(:name) json.version issue.version.try(:name) json.journals_count issue.get_journals_size -json.issue_tags issue.get_issue_tags \ No newline at end of file +json.issue_tags issue.get_issue_tags diff --git a/app/views/pull_requests/index.json.jbuilder b/app/views/pull_requests/index.json.jbuilder index 6b4175013..a6d3e7aeb 100644 --- a/app/views/pull_requests/index.json.jbuilder +++ b/app/views/pull_requests/index.json.jbuilder @@ -27,6 +27,8 @@ json.issues do json.fork_project_identifier pr.fork_project.present? ? pr&.fork_project&.identifier : pr.fork_project_identifier json.fork_project_user pr.fork_project.present? ? pr&.fork_project&.owner.try(:login) : pr.fork_project_owner json.fork_project_user_name pr.fork_project.present? ? pr&.fork_project&.owner.try(:show_real_name) : User.find_by(login: pr.fork_project_owner).try(:show_real_name) + json.merged_at pr.status == PullRequest::MERGED ? format_time(pr.updated_at) : "" + json.closed_at pr.status == PullRequest::CLOSED ? format_time(pr.updated_at) : "" json.reviewers pr.reviewers.pluck(:login) json.id issue.id diff --git a/app/views/pull_requests/show.json.jbuilder b/app/views/pull_requests/show.json.jbuilder index 304457f82..deeeec324 100644 --- a/app/views/pull_requests/show.json.jbuilder +++ b/app/views/pull_requests/show.json.jbuilder @@ -32,6 +32,8 @@ json.pull_request do json.create_user @pull_request&.user&.login json.mergeable @gitea_pull["mergeable"] json.state @gitea_pull["state"] + json.merged_at @pull_request.status == PullRequest::MERGED ? format_time(@pull_request.updated_at) : "" + json.closed_at @pull_request.status == PullRequest::CLOSED ? format_time(@pull_request.updated_at) : "" json.reviewers @pull_request.reviewers.pluck(:login) end