0
0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-15 11:38:33 +01: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
attachments.tmpl
comments_authorlink.tmpl
comments_delete_time.tmpl
comments.tmpl
context_menu.tmpl
conversation.tmpl
pull_merge_instruction.tmpl
pull.tmpl Allow including Reviewed-on/Reviewed-by lines for custom merge messages (#31211) 2024-06-06 08:35:04 +00:00
reactions.tmpl
reference_issue_dialog.tmpl
show_role.tmpl
sidebar.tmpl
update_branch_by_merge.tmpl
watching.tmpl