2 commits

Author	SHA1	Message	Date
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
Robert Wolff	0a74c95b2a	fix(ui): use right placeholder string in milestones search (#4628) ... This PR fixes a wrong placeholder for the search for milestones. I tested it locally (see attachments, below). Before: https://codeberg.org/attachments/ba845ce1-1f20-4131-a74d-7220986a4acf After: https://codeberg.org/attachments/0c4e32ee-b1a8-4472-837d-daa2a2a50121 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4628 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Robert Wolff <mahlzahn@posteo.de> Co-committed-by: Robert Wolff <mahlzahn@posteo.de>	2024-07-25 03:33:44 +00:00