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

2023-01-12 23:48:25 +08:00 · 2023-01-12 23:48:25 +08:00 · 6be3fbbebd
parent a8ae755af3 422c801224
commit 6be3fbbebd
1 changed files with 9 additions and 8 deletions
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@ -182,6 +182,7 @@ class PullRequestsController < ApplicationController
          else
            normal_status(-1, '合并失败')
          end
+        end
      rescue => e
        normal_status(-1, e.message)
        raise ActiveRecord::Rollback