From 6df20e669d5a359044fd4201c6c41f1b053a4cab Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 5 Nov 2025 16:56:46 +0800 Subject: [PATCH] =?UTF-8?q?fixed:=20=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/compare_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/compare_controller.rb b/app/controllers/compare_controller.rb index a007b1178..8c756f3ab 100644 --- a/app/controllers/compare_controller.rb +++ b/app/controllers/compare_controller.rb @@ -35,7 +35,7 @@ class CompareController < ApplicationController @exist_pullrequest = @project.pull_requests.where(is_original: false, head: @base, base: @head, status: 0).take end if @exist_pullrequest.present? - return -2, "在这些分支之间的合并请求已存在:#{@exist_pullrequest.try(:title)}" + return -2, "在这些分支之间的合并请求已存在:#{@exist_pullrequest.try(:title)}" else if @compare_result["FilesCount"].to_i == 0 && @compare_result["CommitsCount"].to_i == 0 return -2, "分支内容相同,无需创建合并请求"