修正合并错误
This commit is contained in:
parent
78545d0f9c
commit
422c801224
|
@ -182,6 +182,7 @@ class PullRequestsController < ApplicationController
|
|||
else
|
||||
normal_status(-1, '合并失败')
|
||||
end
|
||||
end
|
||||
rescue => e
|
||||
normal_status(-1, e.message)
|
||||
raise ActiveRecord::Rollback
|
||||
|
|
Loading…
Reference in New Issue