forked from gitea/gitea
1
0
Fork 0
gitea/routers
zeripath e4e411821d
Abort merge if head has been updated before pressing merge (#18032)
* Abort merge if head has been updated before pressing merge

It is possible that a PR head may be pushed to between the merge page being shown
and the merge button being pressed. Pass the current expected head in as a parameter
and cancel the merge if it has changed.

Fix #18028

Signed-off-by: Andrew Thornton <art27@cantab.net>

* adjust swagger

Signed-off-by: Andrew Thornton <art27@cantab.net>

* fix test

Signed-off-by: Andrew Thornton <art27@cantab.net>

* placate lint

Signed-off-by: Andrew Thornton <art27@cantab.net>
2021-12-20 08:32:54 +08:00
..
api/v1 Abort merge if head has been updated before pressing merge (#18032) 2021-12-20 08:32:54 +08:00
common Update chi/middleware to chi/v5/middleware (#17888) 2021-12-02 21:58:08 +01:00
install Refactor HTTP request context (#17979) 2021-12-15 14:59:57 +08:00
private Refactor HTTP request context (#17979) 2021-12-15 14:59:57 +08:00
utils A better go code formatter, and now `make fmt` can run in Windows (#17684) 2021-11-17 20:34:35 +08:00
web Abort merge if head has been updated before pressing merge (#18032) 2021-12-20 08:32:54 +08:00
init.go Move keys to models/asymkey (#17917) 2021-12-10 16:14:24 +08:00