From 9946b852057ed0ac35da8abf2c23b8723c094aee Mon Sep 17 00:00:00 2001 From: xxq250 Date: Wed, 30 Aug 2023 13:55:57 +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,=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E4=B8=8Bissue=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 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/v1/projects/branches_controller.rb b/app/controllers/api/v1/projects/branches_controller.rb index bd219c23a..c0a8ade3b 100644 --- a/app/controllers/api/v1/projects/branches_controller.rb +++ b/app/controllers/api/v1/projects/branches_controller.rb @@ -22,7 +22,13 @@ class Api::V1::Projects::BranchesController < Api::V1::BaseController 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) + closed = PullRequests::CloseService.call(@project.owner, @project.repository, pull_request, current_user) + if closed === true + pull_request.project_trends.create!(user: current_user, project: @project,action_type: ProjectTrend::CLOSE) + # 合并请求下issue处理为关闭 + pull_request.issue&.update_attributes!({status_id:5}) + SendTemplateMessageJob.perform_later('PullRequestClosed', current_user.id, pull_request.id) if Site.has_notice_menu? + end end end return render_ok