You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
forgejo/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>
3 years ago
..
api/v1 Abort merge if head has been updated before pressing merge (#18032) 3 years ago
common Update chi/middleware to chi/v5/middleware (#17888) 3 years ago
install Refactor HTTP request context (#17979) 3 years ago
private Refactor HTTP request context (#17979) 3 years ago
utils A better go code formatter, and now `make fmt` can run in Windows (#17684) 3 years ago
web Abort merge if head has been updated before pressing merge (#18032) 3 years ago
init.go Move keys to models/asymkey (#17917) 3 years ago