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/options
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
..
gitignore [skip ci] Updated licenses and gitignores 3 years ago
label Add label descriptions (#3662) 6 years ago
license [skip ci] Updated licenses and gitignores 3 years ago
locale Abort merge if head has been updated before pressing merge (#18032) 3 years ago
readme Bindata is optional and over-writable on restart (#354) 8 years ago