floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

FIX check pr can merge

This commit is contained in:
Jasder 2020-11-06 15:21:27 +08:00
parent 9438bf5cd1
commit 181bb05d4a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/pull_requests_controller.rb
View File

@ -223,11 +223,11 @@ class PullRequestsController < ApplicationController
elsif target_head === target_base && !is_original elsif target_head === target_base && !is_original
normal_status(-2, "分支内容相同，无需创建合并请求") normal_status(-2, "分支内容相同，无需创建合并请求")
else else
can_merge = @project&.pull_requests.where(user_id: current_user&.id, head: target_head, base: target_base, status: 0, is_original: is_original, fork_project_id: params[:fork_project_id]) can_merge = @project&.pull_requests.where(head: target_head, base: target_base, status: 0, is_original: is_original, fork_project_id: params[:fork_project_id])
if can_merge.present? if can_merge.present?
render json: { render json: {
status: -2, status: -2,
message: "在这些分支之间的合并请求已存在：<a href='/projects/#{@project.id}/merge/#{can_merge.first.id}/Messagecount''>#{can_merge.first.try(:title)}</a>", message: "在这些分支之间的合并请求已存在：<a href='/projects/#{@owner.login}/#{@project.identifier}/pulls/#{can_merge.first.id}/Messagecount''>#{can_merge.first.try(:title)}</a>",
} }
else else
normal_status(0, "可以合并") normal_status(0, "可以合并")