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.
gitea/routers/api/v1
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
..
admin Ensure complexity, minlength and ispwned are checked on password setting (#18005) 3 years ago
misc Move keys to models/asymkey (#17917) 3 years ago
notify Fix 500 when a comment was deleted which has a notification (#17550) 3 years ago
org Add missing `X-Total-Count` and fix some related bugs (#17968) 3 years ago
repo Abort merge if head has been updated before pressing merge (#18032) 3 years ago
settings Make mirror feature more configurable (#16957) 4 years ago
swagger Add API to get/edit wiki (#17278) 3 years ago
user Refactor HTTP request context (#17979) 3 years ago
utils Use a standalone struct name for Organization (#17632) 3 years ago
api.go Some repository refactors (#17950) 3 years ago