0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-22 15:23:14 -05:00
forgejo/templates
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
..
admin Add slogan config (#3752) 2024-06-07 17:12:48 +00:00
api/packages/pypi Update templates/api/packages/pypi/simple.tmpl 2024-04-12 16:43:30 +00:00
base Add slogan config (#3752) 2024-06-07 17:12:48 +00:00
custom [FEAT] Repository flags 2024-02-05 16:09:42 +01:00
devtest Revert 100% label max-width (#30481) 2024-04-21 11:37:55 +02:00
explore [I18N] Injected updated time in translation string (#3837) 2024-05-20 18:47:35 +00:00
mail Remove title from email heads (#3810) 2024-05-17 10:10:33 +00:00
org Fix org view on mobile for members (#3949) 2024-06-04 04:08:54 +00:00
package templates: Be more forgiving about missing package metadata 2024-05-10 12:07:24 +02:00
projects Remove .segment from .project-column (#31204) 2024-06-09 11:13:39 +02:00
repo Allow including Reviewed-on/Reviewed-by lines for custom merge messages (#31211) 2024-06-09 16:04:57 +02:00
shared Optimize runner-tags layout to enhance visual experience (#31258) 2024-06-09 16:04:57 +02:00
status Add slogan config (#3752) 2024-06-07 17:12:48 +00:00
swagger Document possible action types for the user activity feed API (#31196) 2024-06-09 11:13:39 +02:00
user Fix overflow on notifications (#31178) 2024-06-09 11:13:39 +02:00
webhook webhook: matrix access_token helper text 2024-04-16 08:59:56 +02:00
home.tmpl Add slogan config (#3752) 2024-06-07 17:12:48 +00:00
install.tmpl UI improvements to optional sections in installation page (#4062) 2024-06-07 17:57:54 +00:00
post-install.tmpl [BRANDING] Custom loading animation for Forgejo 2024-02-05 16:02:13 +01:00