1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-22 12:54:53 -05:00
forgejo/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 Add Option to synchronize Admin & Restricted states from OIDC/OAuth2 along with Setting Scopes (#16766) 2021-12-14 16:37:11 +08:00
dev Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
events Move login related structs and functions to models/login (#17093) 2021-09-24 19:32:56 +08:00
explore Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
feed Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
org Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00
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 Fix nil checking on typed interface (#17598) 2021-11-15 21:16:11 +08:00
goget.go Refactor HTTP request context (#17979) 2021-12-15 14:59:57 +08:00
home.go Refactor routers directory (#15800) 2021-06-09 01:33:54 +02:00
metrics.go Refactor routers directory (#15800) 2021-06-09 01:33:54 +02:00
nodeinfo.go Add nodeinfo endpoint for federation purposes (#16953) 2021-09-28 01:38:06 +02:00
swagger_json.go Refactor routers directory (#15800) 2021-06-09 01:33:54 +02:00
web.go Support open compare page directly (#17975) 2021-12-17 22:20:27 +00:00