mirror of
https://codeberg.org/forgejo/forgejo
synced 2025-10-19 01:10:55 +02:00
1efd54b94f
**Backport:** https://codeberg.org/forgejo/forgejo/pulls/8681 - If a repository only has the 'manual merge' strategy allowed, the mergebox should still be shown. - The condition that checks if all merge strategies are disabled didn't check for the manual merge strategy. - Add a integration test that demonstrates this fix is effective. Reported-by: apteryx Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8683 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org> Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org> |
||
|---|---|---|
| .. | ||
| fields | ||
| labels | ||
| milestone | ||
| view_content | ||
| card.tmpl | ||
| choose.tmpl | ||
| comment_tab.tmpl | ||
| filter_actions.tmpl | ||
| filter_list.tmpl | ||
| filters.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 | ||