|
|
|
@@ -146,6 +146,8 @@ class PullRequestsController < ApplicationController |
|
|
|
colsed = PullRequests::CloseService.call(@owner, @repository, @pull_request, current_user) |
|
|
|
if colsed === true |
|
|
|
@pull_request.project_trends.create!(user: current_user, project: @project,action_type: ProjectTrend::CLOSE) |
|
|
|
# 合并请求下issue处理为关闭 |
|
|
|
@issue&.update_attributes!({status_id:5}) |
|
|
|
SendTemplateMessageJob.perform_later('PullRequestClosed', current_user.id, @pull_request.id) if Site.has_notice_menu? |
|
|
|
normal_status(1, "已拒绝") |
|
|
|
else |
|
|
|
@@ -191,6 +193,8 @@ class PullRequestsController < ApplicationController |
|
|
|
# @pull_request.project_trend_status! |
|
|
|
@pull_request.project_trends.create!(user: current_user, project: @project,action_type: ProjectTrend::MERGE) |
|
|
|
@issue&.custom_journal_detail("merge", "", "该合并请求已被合并", current_user&.id) |
|
|
|
# 合并请求下issue处理为关闭 |
|
|
|
@issue&.update_attributes!({status_id:5}) |
|
|
|
SendTemplateMessageJob.perform_later('PullRequestMerged', current_user.id, @pull_request.id) if Site.has_notice_menu? |
|
|
|
normal_status(1, "合并成功") |
|
|
|
else |
|
|
|
|