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, "分支内容相同,无需创建合并请求"