0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-15 17:54:03 +01:00
gitea/templates
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
..
admin Replace gt-word-break with tw-break-anywhere (#31183) 2024-06-04 13:57:11 +00:00
api/packages/pypi Fix links in PyPI Simple Repository API page (#30594) 2024-04-20 01:15:14 +00:00
base Rework and fix stopwatch (#30732) 2024-04-30 14:52:46 +00:00
custom
devtest Fix some UI problems (dropdown/container) (#30849) 2024-05-06 07:17:22 +00:00
explore Refactor web routes (#30519) 2024-04-17 08:31:37 +00:00
mail Remove unnecessary SanitizeHTML from code (#29575) 2024-03-04 12:02:45 +00:00
org Right align the "Settings" menu item in overflow-menu (#30764) 2024-04-30 04:26:13 +00:00
package Replace gt-word-break with tw-break-anywhere (#31183) 2024-06-04 13:57:11 +00:00
projects Replace gt-word-break with tw-break-anywhere (#31183) 2024-06-04 13:57:11 +00:00
repo Allow including Reviewed-on/Reviewed-by lines for custom merge messages (#31211) 2024-06-06 08:35:04 +00:00
shared Optimize runner-tags layout to enhance visual experience (#31258) 2024-06-05 22:39:45 +08:00
status Initial support for colorblindness-friendly themes (#30625) 2024-04-24 00:18:41 +08:00
swagger Document possible action types for the user activity feed API (#31196) 2024-06-03 13:40:48 +00:00
user Fix overflow on notifications (#31178) 2024-06-04 06:10:04 +00:00
webhook Fix incorrect tailwind migration (#30007) 2024-03-22 20:51:29 +01:00
home.tmpl Migrate margin and padding helpers to tailwind (#30043) 2024-03-24 17:42:49 +01:00
install.tmpl Fix some UI problems (install/checkbox) (#30854) 2024-05-06 06:32:05 +00:00
post-install.tmpl Always use ctx.Locale.Tr inside templates (#27231) 2023-09-25 08:56:50 +00:00