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

app/controllers/pull_requests_controller.rb

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