mirror of https://github.com/go-gitea/gitea.git
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 https://github.com/go-gitea/gitea/issues/29071#issuecomment-1931261075pull/24366/merge
parent
6130522aa8
commit
79217ea63c
|
@ -1283,19 +1283,19 @@ func MergePullRequest(ctx *context.Context) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
ctx.Flash.Error(flashError)
|
ctx.Flash.Error(flashError)
|
||||||
ctx.Redirect(issue.Link())
|
ctx.JSONRedirect(issue.Link())
|
||||||
} else if models.IsErrMergeUnrelatedHistories(err) {
|
} else if models.IsErrMergeUnrelatedHistories(err) {
|
||||||
log.Debug("MergeUnrelatedHistories error: %v", err)
|
log.Debug("MergeUnrelatedHistories error: %v", err)
|
||||||
ctx.Flash.Error(ctx.Tr("repo.pulls.unrelated_histories"))
|
ctx.Flash.Error(ctx.Tr("repo.pulls.unrelated_histories"))
|
||||||
ctx.Redirect(issue.Link())
|
ctx.JSONRedirect(issue.Link())
|
||||||
} else if git.IsErrPushOutOfDate(err) {
|
} else if git.IsErrPushOutOfDate(err) {
|
||||||
log.Debug("MergePushOutOfDate error: %v", err)
|
log.Debug("MergePushOutOfDate error: %v", err)
|
||||||
ctx.Flash.Error(ctx.Tr("repo.pulls.merge_out_of_date"))
|
ctx.Flash.Error(ctx.Tr("repo.pulls.merge_out_of_date"))
|
||||||
ctx.Redirect(issue.Link())
|
ctx.JSONRedirect(issue.Link())
|
||||||
} else if models.IsErrSHADoesNotMatch(err) {
|
} else if models.IsErrSHADoesNotMatch(err) {
|
||||||
log.Debug("MergeHeadOutOfDate error: %v", err)
|
log.Debug("MergeHeadOutOfDate error: %v", err)
|
||||||
ctx.Flash.Error(ctx.Tr("repo.pulls.head_out_of_date"))
|
ctx.Flash.Error(ctx.Tr("repo.pulls.head_out_of_date"))
|
||||||
ctx.Redirect(issue.Link())
|
ctx.JSONRedirect(issue.Link())
|
||||||
} else if git.IsErrPushRejected(err) {
|
} else if git.IsErrPushRejected(err) {
|
||||||
log.Debug("MergePushRejected error: %v", err)
|
log.Debug("MergePushRejected error: %v", err)
|
||||||
pushrejErr := err.(*git.ErrPushRejected)
|
pushrejErr := err.(*git.ErrPushRejected)
|
||||||
|
|
Loading…
Reference in New Issue