File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -1283,19 +1283,19 @@ func MergePullRequest(ctx *context.Context) {
1283
1283
return
1284
1284
}
1285
1285
ctx .Flash .Error (flashError )
1286
- ctx .Redirect (issue .Link ())
1286
+ ctx .JSONRedirect (issue .Link ())
1287
1287
} else if models .IsErrMergeUnrelatedHistories (err ) {
1288
1288
log .Debug ("MergeUnrelatedHistories error: %v" , err )
1289
1289
ctx .Flash .Error (ctx .Tr ("repo.pulls.unrelated_histories" ))
1290
- ctx .Redirect (issue .Link ())
1290
+ ctx .JSONRedirect (issue .Link ())
1291
1291
} else if git .IsErrPushOutOfDate (err ) {
1292
1292
log .Debug ("MergePushOutOfDate error: %v" , err )
1293
1293
ctx .Flash .Error (ctx .Tr ("repo.pulls.merge_out_of_date" ))
1294
- ctx .Redirect (issue .Link ())
1294
+ ctx .JSONRedirect (issue .Link ())
1295
1295
} else if models .IsErrSHADoesNotMatch (err ) {
1296
1296
log .Debug ("MergeHeadOutOfDate error: %v" , err )
1297
1297
ctx .Flash .Error (ctx .Tr ("repo.pulls.head_out_of_date" ))
1298
- ctx .Redirect (issue .Link ())
1298
+ ctx .JSONRedirect (issue .Link ())
1299
1299
} else if git .IsErrPushRejected (err ) {
1300
1300
log .Debug ("MergePushRejected error: %v" , err )
1301
1301
pushrejErr := err .(* git.ErrPushRejected )
You can’t perform that action at this time.
0 commit comments