floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-07-16 23:18:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

更改：合并请求代码冲突提示语更改

Browse Source
This commit is contained in:
yystopf
2022-10-19 16:17:44 +08:00
parent 64d9c334ce
commit e9b23d6577
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/services/pull_requests/merge_service.rb
+3
View File
@@ -24,6 +24,9 @@ class PullRequests::MergeService < ApplicationService
result = Gitea::PullRequest::MergeService.call(@current_user.gitea_token, @owner.login, result = Gitea::PullRequest::MergeService.call(@current_user.gitea_token, @owner.login,
@repo.identifier, @pull.gitea_number, gitea_merge_pull_params) @repo.identifier, @pull.gitea_number, gitea_merge_pull_params)
@status, @message = result @status, @message = result
if @status.to_i == 409
@message = "代码冲突，请重新提交合并请求"
end
end end
def gitea_merge_pull_params def gitea_merge_pull_params