fix

2026-05-10 14:59:51 +08:00 · 2021-11-25 11:19:50 +08:00
parent 1b92b53099
commit be0f68cede
2 changed files with 8 additions and 6 deletions
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -197,7 +197,7 @@ class PullRequestsController < ApplicationController
  def check_can_merge
    target_head = params[:head]  #源分支
    target_base = params[:base]  #目标分支
-    is_original = params[:is_original]
+    is_original = params[:is_original] || false
    if target_head.blank? || target_base.blank?
      normal_status(-2, "请选择分支")
    elsif target_head === target_base && !is_original