mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-23 08:47:42 -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> |
||
|---|---|---|
| .. | ||
| labels | ||
| view_content | ||
| branch_selector_field.tmpl | ||
| choose.tmpl | ||
| comment_tab.tmpl | ||
| label_precolors.tmpl | ||
| labels.tmpl | ||
| list.tmpl | ||
| milestone_issues.tmpl | ||
| milestone_new.tmpl | ||
| milestones.tmpl | ||
| navbar.tmpl | ||
| new.tmpl | ||
| new_form.tmpl | ||
| openclose.tmpl | ||
| search.tmpl | ||
| view.tmpl | ||
| view_content.tmpl | ||
| view_title.tmpl | ||