patchii/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
forgejo/templates/repo/issue/view_content
History
Max Wipfli 4ddd9af50f
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}
```

(cherry picked from commit da4bbc42477ba04d175cc0775a0c5ec90c4c24fe)

Conflicts:
	docs/content/usage/merge-message-templates.en-us.md
	not in Forgejo
	templates/repo/issue/view_content/pull.tmpl
	trivial context conflict
2024-06-09 16:04:57 +02:00
..
sidebar Fix long branch name overflows (https://github.com/go-gitea/gitea/pull/30345) 2024-05-24 22:11:37 +05:00
add_reaction.tmpl
attachments.tmpl Provide a way to translate data units 2024-03-30 21:10:47 +05:00
comments.tmpl Prevent simultaneous editing of comments and issues (#31053) 2024-06-02 16:26:54 +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 Prevent simultaneous editing of comments and issues (#31053) 2024-06-02 16:26:54 +02:00
pull.tmpl Allow including Reviewed-on/Reviewed-by lines for custom merge messages (#31211) 2024-06-09 16:04:57 +02:00
pull_merge_instruction.tmpl Migrate gt-hidden to tw-hidden (#30046) 2024-03-30 07:17:29 +01:00
reactions.tmpl Add non-JS fallback for reaction tooltips (#28785) 2024-01-15 09:42:59 +08:00
reference_issue_dialog.tmpl Fix dropdown text ellipsis (#30628) 2024-04-22 21:02:29 +02:00
show_role.tmpl
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