Skip to content

Commit dcb9c38

Browse files
authored
Fix error display when merging PRs (#29288) (#29309)
Backport #29288 Partially fix #29071, regression of Modernize merge button #28140 Fix some missing `Redirect` -> `JSONRedirect`. Thanks @yp05327 for the help in #29071 (comment)
1 parent c4a86b2 commit dcb9c38

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

routers/web/repo/pull.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -1266,19 +1266,19 @@ func MergePullRequest(ctx *context.Context) {
12661266
return
12671267
}
12681268
ctx.Flash.Error(flashError)
1269-
ctx.Redirect(issue.Link())
1269+
ctx.JSONRedirect(issue.Link())
12701270
} else if models.IsErrMergeUnrelatedHistories(err) {
12711271
log.Debug("MergeUnrelatedHistories error: %v", err)
12721272
ctx.Flash.Error(ctx.Tr("repo.pulls.unrelated_histories"))
1273-
ctx.Redirect(issue.Link())
1273+
ctx.JSONRedirect(issue.Link())
12741274
} else if git.IsErrPushOutOfDate(err) {
12751275
log.Debug("MergePushOutOfDate error: %v", err)
12761276
ctx.Flash.Error(ctx.Tr("repo.pulls.merge_out_of_date"))
1277-
ctx.Redirect(issue.Link())
1277+
ctx.JSONRedirect(issue.Link())
12781278
} else if models.IsErrSHADoesNotMatch(err) {
12791279
log.Debug("MergeHeadOutOfDate error: %v", err)
12801280
ctx.Flash.Error(ctx.Tr("repo.pulls.head_out_of_date"))
1281-
ctx.Redirect(issue.Link())
1281+
ctx.JSONRedirect(issue.Link())
12821282
} else if git.IsErrPushRejected(err) {
12831283
log.Debug("MergePushRejected error: %v", err)
12841284
pushrejErr := err.(*git.ErrPushRejected)

0 commit comments

Comments
 (0)