0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-11-05 13:49:10 +01:00
gitea/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>
2021-12-20 08:32:54 +08:00
..
gitignore [skip ci] Updated licenses and gitignores 2021-12-19 00:29:01 +00:00
label Add label descriptions (#3662) 2018-03-13 10:03:55 +08:00
license [skip ci] Updated licenses and gitignores 2021-11-21 00:25:17 +00:00
locale Abort merge if head has been updated before pressing merge (#18032) 2021-12-20 08:32:54 +08:00
readme Bindata is optional and over-writable on restart (#354) 2016-12-22 19:12:23 +01:00