Gusted d22f9d1f38 fix: show mergebox when only manual merge is allowed (#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 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8681 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Gusted <postmaster@gusted.xyz> Co-committed-by: Gusted <postmaster@gusted.xyz>		2025-07-26 05:47:06 +02:00
..
e2e	tests(e2e): Silence heading level warning (#8659)	2025-07-25 02:39:16 +02:00
fuzz	chore: branding import path (#7337)	2025-03-27 19:40:14 +00:00
gitea-lfs-meta
gitea-repositories-meta	Implement single-commit PR review flow (#7155)	2025-06-17 09:31:50 +02:00
integration	fix: show mergebox when only manual merge is allowed (#8681)	2025-07-26 05:47:06 +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	Revert "feat: remove API authentication methods that uses the URL query (#7924)" (#8633)	2025-07-24 17:19:24 +02:00
pgsql.ini.tmpl	Revert "feat: remove API authentication methods that uses the URL query (#7924)" (#8633)	2025-07-24 17:19:24 +02:00
sqlite.ini.tmpl	Revert "feat: remove API authentication methods that uses the URL query (#7924)" (#8633)	2025-07-24 17:19:24 +02:00
test_utils.go	feat: detect incorrect integration test functions (#8352)	2025-06-29 23:09:29 +02:00