1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-26 13:29:12 -05:00
forgejo/services/forms
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.go Add Visible modes function from Organisation to Users too (#16069) 2021-06-26 20:53:14 +01:00
auth_form.go Add Option to synchronize Admin & Restricted states from OIDC/OAuth2 along with Setting Scopes (#16766) 2021-12-14 16:37:11 +08:00
org.go Move unit into models/unit/ (#17576) 2021-11-09 20:57:58 +01:00
repo_branch_form.go Add a simple way to rename branch like gh (#15870) 2021-10-08 19:03:04 +02:00
repo_form.go Abort merge if head has been updated before pressing merge (#18032) 2021-12-20 08:32:54 +08:00
repo_form_test.go Move modules/forms to services/forms (#15305) 2021-04-06 20:44:05 +01:00
repo_tag_form.go Add tag protection (#15629) 2021-06-25 16:28:55 +02:00
user_form.go Add support for ssh commit signing (#17743) 2021-12-19 00:37:18 -05:00
user_form_auth_openid.go A better go code formatter, and now make fmt can run in Windows (#17684) 2021-11-17 20:34:35 +08:00
user_form_test.go Move modules/forms to services/forms (#15305) 2021-04-06 20:44:05 +01:00