a1012112796 e5f8d144f2 [PORT] Add warning message in merge instructions when AutodetectManualMerge was not enabled (gitea#31805) ... --- Conflict resolution: trivial Things done differently: Improve localization message, use the paragraph element instead of the div element, fix passing this variable to the template and add a integration test (cherry picked from commit 9633f336c87947dc7d2a5e76077a10699ba5e50d)		2024-08-11 19:15:37 +02:00
..
e2e	Merge pull request 'fix(ui): allow unreacting from comment popover' (#4798) from solomonv/forgejo:issue-reaction-fixes into forgejo	2024-08-10 05:45:55 +00:00
fuzz
gitea-lfs-meta
gitea-repositories-meta	Add support for workflow_dispatch (#3334)	2024-06-28 05:17:11 +00:00
integration	[PORT] Add warning message in merge instructions when AutodetectManualMerge was not enabled (gitea#31805)	2024-08-11 19:15:37 +02:00
testdata/data/attachments/a/0
mysql.ini.tmpl	Update instance title in tests	2024-06-08 23:33:55 +05:00
pgsql.ini.tmpl	Update instance title in tests	2024-06-08 23:33:55 +05:00
sqlite.ini.tmpl	Update instance title in tests	2024-06-08 23:33:55 +05:00
test_utils.go	Add testifylint to lint checks (#4535)	2024-07-30 19:41:10 +00:00