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