aniani/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-09-20 01:45:59 -04:00
Code
ccf7366db0
gitea/templates/repo/issue/view_content
History
a1012112796 9633f336c8
Add warning message in merge instructions when AutodetectManualMerge was not enabled (#31805) 
not enabled

quick-f-i-x https://github.com/go-gitea/gitea/issues/31433 ? , maybe
need more disscusion about better solutions.

example view:


![image](https://github.com/user-attachments/assets/2af7e1e8-42b9-4473-89c7-12d4a9205d3f)

adtion notes about how to enable `AutodetectManualMerge`


![image](https://github.com/user-attachments/assets/28f84317-367a-40d8-b50d-a19ef7c664d4)

Signed-off-by: a1012112796 <1012112796@qq.com>
2024-08-10 01:09:34 +00:00
..
add_reaction.tmpl Rewrite and restyle reaction selector and enable no-sizzle eslint rule (#30453) 2024-04-14 18:44:11 +08:00
attachments.tmpl Migrate margin and padding helpers to tailwind (#30043) 2024-03-24 17:42:49 +01:00
comments_authorlink.tmpl Include resource state events in Gitlab downloads (#29382) 2024-02-26 05:08:21 +01:00
comments_delete_time.tmpl Replace some gt- classes with tw- (#29570) 2024-03-04 03:33:20 +00:00
comments.tmpl Add issue comment when moving issues from one column to another of the project (#29311) 2024-08-09 01:29:02 +00:00
context_menu.tmpl Refactor repo unit "disabled" check (#31389) 2024-06-18 00:51:13 +00:00
conversation.tmpl Replace gt-word-break with tw-break-anywhere (#31183) 2024-06-04 13:57:11 +00:00
pull_merge_instruction.tmpl Add warning message in merge instructions when AutodetectManualMerge was not enabled (#31805) 2024-08-10 01:09:34 +00:00
pull.tmpl Allow including Reviewed-on/Reviewed-by lines for custom merge messages (#31211) 2024-06-06 08:35:04 +00:00
reactions.tmpl Rewrite and restyle reaction selector and enable no-sizzle eslint rule (#30453) 2024-04-14 18:44:11 +08:00
reference_issue_dialog.tmpl Fix some UI problems (dropdown/container) (#30849) 2024-05-06 07:17:22 +00:00
show_role.tmpl Add member, collaborator, contributor, and first-time contributor roles and tooltips (#26658) 2023-08-24 13:06:17 +08:00
sidebar.tmpl code optimization (#31315) 2024-06-11 21:07:10 +08:00
update_branch_by_merge.tmpl Replace 10 more gt- classes with tw- (#29945) 2024-03-22 13:45:10 +00:00
watching.tmpl Migrate margin and padding helpers to tailwind (#30043) 2024-03-24 17:42:49 +01:00