yystopf
/
forgeplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '合并代码错误' (#320) from Nigel/forgeplus:master into dev_nanda

This commit is contained in:
xxq250 2023-01-12 23:48:25 +08:00
parent a8ae755af3 422c801224
commit 6be3fbbebd
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/controllers/pull_requests_controller.rb
View File

@ -173,14 +173,15 @@ class PullRequestsController < ApplicationController
normal_status(-1, "拒绝失败") normal_status(-1, "拒绝失败")
raise ActiveRecord::Rollback raise ActiveRecord::Rollback
else else
if colsed === true if colsed === true
@pull_request.project_trends.create!(user: current_user, project: @project,action_type: ProjectTrend::CLOSE) @pull_request.project_trends.create!(user: current_user, project: @project,action_type: ProjectTrend::CLOSE)
# 合并请求下issue处理为关闭 # 合并请求下issue处理为关闭
@issue&.update_attributes!({status_id:5}) @issue&.update_attributes!({status_id:5})
SendTemplateMessageJob.perform_later('PullRequestClosed', current_user.id, @pull_request.id) if Site.has_notice_menu? SendTemplateMessageJob.perform_later('PullRequestClosed', current_user.id, @pull_request.id) if Site.has_notice_menu?
normal_status(1, "已拒绝") normal_status(1, "已拒绝")
else else
normal_status(-1, '合并失败') normal_status(-1, '合并失败')
end
end end
rescue => e rescue => e
normal_status(-1, e.message) normal_status(-1, e.message)