0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-06-30 16:28:42 +02:00
gitea/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
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
repo_branch_form.go
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
repo_tag_form.go
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