forgejo/services
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
..
agit
asymkey Add missing X-Total-Count and fix some related bugs (#17968) 2021-12-15 13:39:34 +08:00
attachment
auth Add Option to synchronize Admin & Restricted states from OIDC/OAuth2 along with Setting Scopes (#16766) 2021-12-14 16:37:11 +08:00
comments
cron Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00
externalaccount Refactor HTTP request context (#17979) 2021-12-15 14:59:57 +08:00
forms Abort merge if head has been updated before pressing merge (#18032) 2021-12-20 08:32:54 +08:00
gitdiff
issue
lfs
mailer Add missing X-Total-Count and fix some related bugs (#17968) 2021-12-15 13:39:34 +08:00
migrations Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00
mirror Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00
org
pull Abort merge if head has been updated before pressing merge (#18032) 2021-12-20 08:32:54 +08:00
release
repository Fix rename notification bug (#18008) 2021-12-17 14:24:47 +08:00
task Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00
user
webhook Add missing X-Total-Count and fix some related bugs (#17968) 2021-12-15 13:39:34 +08:00
wiki Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00