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

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