forgejo-federation/templates/repo/issue
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
..
fields Support setting the default attribute of the issue template dropdown field (#31045) 2024-05-26 20:13:09 +02:00
labels [UI] Replace italics in Settings UI 2024-04-29 19:16:52 +02:00
milestone [BUG] Consistent styling for Sort filter 2024-03-31 16:24:03 +02:00
view_content Allow including Reviewed-on/Reviewed-by lines for custom merge messages (#31211) 2024-06-09 16:04:57 +02:00
card.tmpl Fix overflow in issue card (#31203) 2024-06-09 11:13:39 +02:00
choose.tmpl Fix spacing in issue navbar (#30238) 2024-04-07 15:40:31 +02:00
comment_tab.tmpl Always use ctx.Locale.Tr inside templates (#27231) 2023-09-25 08:56:50 +00:00
filter_actions.tmpl Rename project board -> column to make the UI less confusing (#30170) 2024-06-02 09:42:39 +02:00
filter_list.tmpl add label filters in org/{org_name}/issues 2024-04-04 17:57:11 +05:30
filters.tmpl Migrate margin and padding helpers to tailwind (#30043) 2024-03-30 07:17:29 +01:00
label_precolors.tmpl Replace 10 more gt- classes with tw- (#29945) 2024-03-26 19:04:27 +01:00
labels.tmpl Fix spacing in issue navbar (#30238) 2024-04-07 15:40:31 +02:00
list.tmpl Fix New issue button consistency 2024-03-30 21:08:34 +05:00
milestone_issues.tmpl Add codespell support and fix a good number of typos with its help (#3270) 2024-05-09 13:49:37 +00:00
milestone_new.tmpl Fix spacing in issue navbar (#30238) 2024-04-07 15:40:31 +02:00
milestones.tmpl [UI] Fix milestone header inconsistencies with issues/PRs 2024-04-20 14:06:26 +05:00
navbar.tmpl Fix menu buttons in issues and release (#30056) 2024-03-30 07:17:30 +01:00
new.tmpl Fix incorrect redirection when creating a PR fails (#29537) 2024-03-06 12:10:45 +08:00
new_form.tmpl Move branch_selection to sidebar folder 2024-04-27 02:22:04 +02:00
openclose.tmpl Migrate margin and padding helpers to tailwind (#30043) 2024-03-30 07:17:29 +01:00
search.tmpl Migrate gt-hidden to tw-hidden (#30046) 2024-03-30 07:17:29 +01:00
view.tmpl Make Issue/PR/projects more compact, misc CSS tweaks (#24459) 2023-05-03 17:58:59 -04:00
view_content.tmpl Prevent simultaneous editing of comments and issues (#31053) 2024-06-02 16:26:54 +02:00
view_title.tmpl Fix long branch name overflows (https://github.com/go-gitea/gitea/pull/30345) 2024-05-24 22:11:37 +05:00