From 1d6d48fc9492c6bc0e6deab9fe94e4574d063472 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 7 Jul 2022 09:24:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20pr=20=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E5=AE=A1=E6=A0=B8=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 2 +- app/views/pull_requests/show.json.jbuilder | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 34ac97632..51fa37aca 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -9,7 +9,7 @@ class RepositoriesController < ApplicationController before_action :load_repository before_action :authorizate!, except: [:sync_mirror, :tags, :commit, :archive] before_action :authorizate_user_can_edit_repo!, only: %i[sync_mirror] - before_action :get_ref, only: %i[entries sub_entries top_counts file archive] + before_action :get_ref, only: %i[entries sub_entries top_counts files archive] before_action :get_latest_commit, only: %i[entries sub_entries top_counts] before_action :get_statistics, only: %i[top_counts] diff --git a/app/views/pull_requests/show.json.jbuilder b/app/views/pull_requests/show.json.jbuilder index 4d5e7aef2..684a60e9c 100644 --- a/app/views/pull_requests/show.json.jbuilder +++ b/app/views/pull_requests/show.json.jbuilder @@ -15,9 +15,11 @@ json.author do json.partial! 'users/user_simple', user: @issue_user end -json.last_review do - json.(@last_review, :id, :commit_id, :content, :status) - json.created_at format_time(@last_review.created_at) +if @last_review.present? + json.last_review do + json.(@last_review, :id, :commit_id, :content, :status) + json.created_at format_time(@last_review.created_at) + end end json.pull_request do