File tree 1 file changed +4
-4
lines changed 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -1266,19 +1266,19 @@ func MergePullRequest(ctx *context.Context) {
1266
1266
return
1267
1267
}
1268
1268
ctx .Flash .Error (flashError )
1269
- ctx .Redirect (issue .Link ())
1269
+ ctx .JSONRedirect (issue .Link ())
1270
1270
} else if models .IsErrMergeUnrelatedHistories (err ) {
1271
1271
log .Debug ("MergeUnrelatedHistories error: %v" , err )
1272
1272
ctx .Flash .Error (ctx .Tr ("repo.pulls.unrelated_histories" ))
1273
- ctx .Redirect (issue .Link ())
1273
+ ctx .JSONRedirect (issue .Link ())
1274
1274
} else if git .IsErrPushOutOfDate (err ) {
1275
1275
log .Debug ("MergePushOutOfDate error: %v" , err )
1276
1276
ctx .Flash .Error (ctx .Tr ("repo.pulls.merge_out_of_date" ))
1277
- ctx .Redirect (issue .Link ())
1277
+ ctx .JSONRedirect (issue .Link ())
1278
1278
} else if models .IsErrSHADoesNotMatch (err ) {
1279
1279
log .Debug ("MergeHeadOutOfDate error: %v" , err )
1280
1280
ctx .Flash .Error (ctx .Tr ("repo.pulls.head_out_of_date" ))
1281
- ctx .Redirect (issue .Link ())
1281
+ ctx .JSONRedirect (issue .Link ())
1282
1282
} else if git .IsErrPushRejected (err ) {
1283
1283
log .Debug ("MergePushRejected error: %v" , err )
1284
1284
pushrejErr := err .(* git.ErrPushRejected )
You can’t perform that action at this time.
0 commit comments