From 810e8b988719b8538aec99f02d49854a36692bfb Mon Sep 17 00:00:00 2001 From: xxq250 Date: Wed, 30 Aug 2023 13:51:56 +0800 Subject: [PATCH] =?UTF-8?q?fixed=20=E5=88=86=E6=94=AF=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=B6=E6=9C=89=E5=BC=80=E5=90=AF=E7=9A=84pr=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E4=B8=80=E5=90=8C=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/projects/branches_controller.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/v1/projects/branches_controller.rb b/app/controllers/api/v1/projects/branches_controller.rb index 0c89f6012..bd219c23a 100644 --- a/app/controllers/api/v1/projects/branches_controller.rb +++ b/app/controllers/api/v1/projects/branches_controller.rb @@ -17,7 +17,14 @@ class Api::V1::Projects::BranchesController < Api::V1::BaseController def destroy @result_object = Api::V1::Projects::Branches::DeleteService.call(@project, params[:name], current_user&.gitea_token) - if @result_object + if @result_object + # 有开启的pr需要一同关闭 + open_pull_requests = @project.pull_requests.opening.where(head: params[:name]).where(user_id: current_user.id) + if open_pull_requests.present? + open_pull_requests.each do |pull_request| + PullRequests::CloseService.call(@project.owner, @project.repository, pull_request, current_user) + end + end return render_ok else return render_error('删除分支失败!')