mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-10-18 08:08:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: prevent pull requests from being merged multiple times

Browse source
This commit is contained in:
BtbN 2025-08-09 22:12:33 +02:00 • committed by BtbN
commit 0b552407fe
5 changed files with 63 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
routers/web/repo/pull.go
View file

@ -1445,6 +1445,10 @@ func MergePullRequest(ctx *context.Context) {
log.Debug("MergeUnrelatedHistories error: %v", err)
ctx.Flash.Error(ctx.Tr("repo.pulls.unrelated_histories"))
ctx.JSONRedirect(issue.Link())
} else if models.IsErrPullRequestHasMerged(err) {
log.Debug("MergePullRequestHasMerged error: %v", err)
ctx.Flash.Error(ctx.Tr("repo.pulls.already_merged"))
ctx.JSONRedirect(issue.Link())
} else if git.IsErrPushOutOfDate(err) {
log.Debug("MergePushOutOfDate error: %v", err)
ctx.Flash.Error(ctx.Tr("repo.pulls.merge_out_of_date"))