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
..
sidebar	[UI] Convert milestone to HTMX	2024-07-17 14:52:00 +02:00
add_reaction.tmpl
attachments.tmpl	Provide a way to translate data units	2024-03-30 21:10:47 +05:00
comments.tmpl	Fix the display of project type for deleted projects (#31732)	2024-08-04 10:14:34 +02:00
comments_authorlink.tmpl	Include resource state events in Gitlab downloads (#29382)	2024-03-06 12:10:43 +08:00
comments_delete_time.tmpl	Replace some gt- classes with tw- (#29570)	2024-03-11 23:36:57 +07:00
context_menu.tmpl
conversation.tmpl	fix(ui): fix conversation template	2024-07-25 23:51:17 +05:00
pull.tmpl	[PORT] Add warning message in merge instructions when AutodetectManualMerge was not enabled (gitea#31805)	2024-08-11 19:15:37 +02:00
pull_merge_instruction.tmpl	[PORT] Add warning message in merge instructions when AutodetectManualMerge was not enabled (gitea#31805)	2024-08-11 19:15:37 +02:00
reactions.tmpl
reference_issue_dialog.tmpl	Fix dropdown text ellipsis (#30628)	2024-04-22 21:02:29 +02:00
show_role.tmpl	Clarify author label in tooltip	2024-06-25 18:30:06 +05:00
sidebar.tmpl	Unify allow edits logic	2024-04-27 02:22:05 +02:00
update_branch_by_merge.tmpl	Replace 10 more gt- classes with tw- (#29945)	2024-03-26 19:04:27 +01:00