mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-24 13:09:23 -05:00
e4e411821d
* 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> |
||
---|---|---|
.. | ||
admin.go | ||
auth_form.go | ||
org.go | ||
repo_branch_form.go | ||
repo_form.go | ||
repo_form_test.go | ||
repo_tag_form.go | ||
user_form.go | ||
user_form_auth_openid.go | ||
user_form_test.go |