You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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>
3 years ago
..
admin.go Add Visible modes function from Organisation to Users too (#16069) 3 years ago
auth_form.go Add Option to synchronize Admin & Restricted states from OIDC/OAuth2 along with Setting Scopes (#16766) 3 years ago
org.go Move unit into models/unit/ (#17576) 3 years ago
repo_branch_form.go Add a simple way to rename branch like gh (#15870) 3 years ago
repo_form.go Abort merge if head has been updated before pressing merge (#18032) 3 years ago
repo_form_test.go Move modules/forms to services/forms (#15305) 3 years ago
repo_tag_form.go Add tag protection (#15629) 3 years ago
user_form.go Add support for ssh commit signing (#17743) 3 years ago
user_form_auth_openid.go A better go code formatter, and now `make fmt` can run in Windows (#17684) 3 years ago
user_form_test.go Move modules/forms to services/forms (#15305) 3 years ago