1
1
mirror of https://github.com/go-gitea/gitea synced 2024-11-07 18:54:25 +00:00
gitea/templates/repo/issue/view_content
Max Wipfli da4bbc4247
Allow including Reviewed-on/Reviewed-by lines for custom merge messages (#31211)
This PR introduces the `ReviewedOn` and `ReviewedBy` variables for the
default merge message templates (e.g.,
`.gitea/default_merge_message/MERGE_TEMPLATE.md`).

This allows customizing the default merge messages while retaining these
trailers.

This also moves the associated logic out of `pull.tmpl` into the
relevant Go function.

This is a first contribution towards #11077.

---

For illustration, this allows to recreate the "default default" merge
message with the following template:
```
.gitea/default_merge_message/MERGE_TEMPLATE.md
Merge pull request '${PullRequestTitle}' (${PullRequestReference}) from ${HeadBranch} into ${BaseBranch}

${ReviewedOn}
${ReviewedBy}
```
2024-06-06 08:35:04 +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 Prevent simultaneous editing of comments and issues (#31053) 2024-05-27 15:34:18 +00:00
context_menu.tmpl Add user blocking (#29028) 2024-03-04 08:16:03 +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 Fix agit checkout command line hint & fix ShowMergeInstructions checking (#31219) 2024-06-03 06:45:21 +08: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 Remove fomantic button module (#30475) 2024-04-14 17:53:52 +00: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