mirror of
https://codeberg.org/forgejo/forgejo
synced 2025-10-19 14:50:52 +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> |
||
|---|---|---|
| .. | ||
| sidebar | ||
| add_reaction.tmpl | ||
| attachments.tmpl | ||
| comments.tmpl | ||
| comments_authorlink.tmpl | ||
| comments_delete_time.tmpl | ||
| context_menu.tmpl | ||
| conversation.tmpl | ||
| pull.tmpl | ||
| pull_merge_instruction.tmpl | ||
| reactions.tmpl | ||
| reference_issue_dialog.tmpl | ||
| show_role.tmpl | ||
| sidebar.tmpl | ||
| update_branch_by_merge.tmpl | ||