1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-10-05 19:30:58 +00:00
forgejo/templates
forgejo-backport-action 1efd54b94f [v12.0/forgejo] fix: show mergebox when only manual merge is allowed (#8683)
**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>
2025-07-26 16:07:56 +02:00
..
admin feat(ui): show size constraints of custom avatar (#7998) 2025-06-14 16:35:50 +02:00
api/packages/pypi Update templates/api/packages/pypi/simple.tmpl 2024-04-12 16:43:30 +00:00
base feat(ui): redesign user profile actions layout (#7906) 2025-06-24 14:16:51 +02:00
custom [FEAT] Repository flags 2024-02-05 16:09:42 +01:00
devtest chore(ui): clean up hashbox CSS, small design changes (#7822) 2025-05-25 12:51:27 +02:00
explore ui: simplify main-attribute labels 2024-12-08 17:30:52 +05:00
htmx Update module github.com/editorconfig-checker/editorconfig-checker/v2/cmd/editorconfig-checker to v3 2024-08-09 21:03:37 +02:00
mail [v12.0/forgejo] fix(email): actions notification template confuses branch with PR (#8455) 2025-07-09 10:20:54 +02:00
moderation feat!: Abusive content reporting (#6977) 2025-05-18 08:05:16 +00:00
org feat(ui): show size constraints of custom avatar (#7998) 2025-06-14 16:35:50 +02:00
package [v12.0/forgejo] several fixes of ALT Package registry (#8480) 2025-07-10 21:57:46 +02:00
projects fix(ui): use gap in switch items (#7581) 2025-04-21 04:25:08 +00:00
repo [v12.0/forgejo] fix: show mergebox when only manual merge is allowed (#8683) 2025-07-26 16:07:56 +02:00
shared feat(ui): redesign user profile actions layout (#7906) 2025-06-24 14:16:51 +02:00
status ui: improve error pages (#7274) 2025-03-28 19:50:43 +00:00
swagger [v12.0/forgejo] Revert "feat: remove API authentication methods that uses the URL query (#7924)" (#8653) 2025-07-24 17:53:11 +02:00
user [v12.0/forgejo] fix(ui): add missing lazy load attribute to images (#8282) 2025-06-25 20:42:35 +02:00
webhook Actions Failure, Succes, Recover Webhooks (#7508) 2025-06-03 14:29:19 +02:00
home.tmpl Split Forgejo landing page template to allow patching or removing Forgejo introduction section (#6675) 2025-02-03 08:41:52 +00:00
home_forgejo.tmpl Split Forgejo landing page template to allow patching or removing Forgejo introduction section (#6675) 2025-02-03 08:41:52 +00:00
install.tmpl Added alt's to <img> 2025-01-31 21:22:00 +00:00
post-install.tmpl [BRANDING] Custom loading animation for Forgejo 2024-02-05 16:02:13 +01:00