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

Merge branch 'develop' into standalone_develop

This commit is contained in:
yystopf 2024-03-16 16:03:43 +08:00
parent b051213278 a0f1679f03
commit 62ff6dd1d7
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/pull_requests_controller.rb
View File

@ -203,6 +203,7 @@ class PullRequestsController < ApplicationController
def pr_merge def pr_merge
return render_forbidden("你没有权限操作.") unless @project.operator?(current_user) return render_forbidden("你没有权限操作.") unless @project.operator?(current_user)
return normal_status(-1, "该分支存在冲突，无法自动合并.") unless @pull_request.conflict_files.blank?
if params[:do].blank? if params[:do].blank?
normal_status(-1, "请选择合并方式") normal_status(-1, "请选择合并方式")