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

This commit is contained in:
yystopf 2021-11-25 11:00:19 +08:00
parent 5634413cac
commit 1b92b53099
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/services/pull_requests/create_service.rb
View File

@ -148,8 +148,7 @@ class PullRequests::CreateService < ApplicationService
puts @params[:head]
puts @params[:base]
raise "分支内容相同，无需创建合并请求" if @params[:head] === @params[:base] && !@params[:is_original]
can_merge = @project&.pull_requests.where(head: @params[:head], base: @params[:base], status: 0, is_original: @params[:is_original], fork_project_id: @params[:fork_project_id]).blank?
raise "合并请求已存在" if can_merge
raise "合并请求已存在" if @project&.pull_requests.where(head: @params[:head], base: @params[:base], status: 0, is_original: @params[:is_original], fork_project_id: @params[:fork_project_id]).present?
raise @pull_issue.errors.full_messages.join(", ") unless pull_issue.valid?
raise @pull_request.errors.full_messages.join(", ") unless pull_request.valid?
end