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

修正合并错误

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

1
app/controllers/pull_requests_controller.rb
View File

@ -182,6 +182,7 @@ class PullRequestsController < ApplicationController
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)
raise ActiveRecord::Rollback raise ActiveRecord::Rollback