0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-02-18 03:01:56 +01:00
gitea/routers/web
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
..
admin
dev
events
explore
feed
org
repo Abort merge if head has been updated before pressing merge (#18032) 2021-12-20 08:32:54 +08:00
user Reset locale on login (#18023) 2021-12-19 13:31:43 +00:00
base.go
goget.go
home.go
metrics.go
nodeinfo.go
swagger_json.go
web.go Support open compare page directly (#17975) 2021-12-17 22:20:27 +00:00