mirror of
https://github.com/go-gitea/gitea.git
synced 2024-11-30 18:55:17 +01:00
e4e411821d
* 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> |
||
---|---|---|
.. | ||
admin | ||
misc | ||
notify | ||
org | ||
repo | ||
settings | ||
swagger | ||
user | ||
utils | ||
api.go |