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
..
e2e	[v12.0/forgejo] chore: disable E2E test for webkit (#8616)	2025-07-22 21:08:03 +02:00
fuzz	chore: branding import path (#7337)	2025-03-27 19:40:14 +00:00
gitea-lfs-meta	Test views of LFS files (#22196)	2022-12-23 07:41:56 +08:00
gitea-repositories-meta	Implement single-commit PR review flow (#7155)	2025-06-17 09:31:50 +02:00
integration	[v12.0/forgejo] fix: show mergebox when only manual merge is allowed (#8683)	2025-07-26 16:07:56 +02:00
testdata/data	add model viewer for .glb (GLTF) model in file view (#8111)	2025-06-21 14:42:35 +02:00
mysql.ini.tmpl	[v12.0/forgejo] Revert "feat: remove API authentication methods that uses the URL query (#7924)" (#8653)	2025-07-24 17:53:11 +02:00
pgsql.ini.tmpl	[v12.0/forgejo] Revert "feat: remove API authentication methods that uses the URL query (#7924)" (#8653)	2025-07-24 17:53:11 +02:00
sqlite.ini.tmpl	[v12.0/forgejo] Revert "feat: remove API authentication methods that uses the URL query (#7924)" (#8653)	2025-07-24 17:53:11 +02:00
test_utils.go	API: enforce sha requirement on POST /repos/{owner}/{repo}/contents (#8139)	2025-06-12 00:13:39 +02:00