Skip to content

Commit 321aaed

Browse files
Zettat123earl-warren
authored andcommitted
Fix error display when merging PRs (#29288)
Partially fix #29071, regression of Modernize merge button #28140 Fix some missing `Redirect` -> `JSONRedirect`. Thanks @yp05327 for the help in go-gitea/gitea#29071 (comment) (cherry picked from commit 79217ea63c1f77de7ca79813ae45950724e63d02)
1 parent 769db26 commit 321aaed

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

routers/web/repo/pull.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1311,19 +1311,19 @@ func MergePullRequest(ctx *context.Context) {
13111311
return
13121312
}
13131313
ctx.Flash.Error(flashError)
1314-
ctx.Redirect(issue.Link())
1314+
ctx.JSONRedirect(issue.Link())
13151315
} else if models.IsErrMergeUnrelatedHistories(err) {
13161316
log.Debug("MergeUnrelatedHistories error: %v", err)
13171317
ctx.Flash.Error(ctx.Tr("repo.pulls.unrelated_histories"))
1318-
ctx.Redirect(issue.Link())
1318+
ctx.JSONRedirect(issue.Link())
13191319
} else if git.IsErrPushOutOfDate(err) {
13201320
log.Debug("MergePushOutOfDate error: %v", err)
13211321
ctx.Flash.Error(ctx.Tr("repo.pulls.merge_out_of_date"))
1322-
ctx.Redirect(issue.Link())
1322+
ctx.JSONRedirect(issue.Link())
13231323
} else if models.IsErrSHADoesNotMatch(err) {
13241324
log.Debug("MergeHeadOutOfDate error: %v", err)
13251325
ctx.Flash.Error(ctx.Tr("repo.pulls.head_out_of_date"))
1326-
ctx.Redirect(issue.Link())
1326+
ctx.JSONRedirect(issue.Link())
13271327
} else if git.IsErrPushRejected(err) {
13281328
log.Debug("MergePushRejected error: %v", err)
13291329
pushrejErr := err.(*git.ErrPushRejected)

0 commit comments

Comments
 (0)