You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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} ```		8 months ago
..
add_reaction.tmpl	Rewrite and restyle reaction selector and enable no-sizzle eslint rule (#30453)	10 months ago
attachments.tmpl	Migrate margin and padding helpers to tailwind (#30043)	10 months ago
comments.tmpl	Prevent simultaneous editing of comments and issues (#31053)	8 months ago
comments_authorlink.tmpl	Include resource state events in Gitlab downloads (#29382)	11 months ago
comments_delete_time.tmpl	Replace some `gt-` classes with `tw-` (#29570)	11 months ago
context_menu.tmpl	Add user blocking (#29028)	11 months ago
conversation.tmpl	Replace `gt-word-break` with `tw-break-anywhere` (#31183)	8 months ago
pull.tmpl	Allow including `Reviewed-on`/`Reviewed-by` lines for custom merge messages (#31211)	8 months ago
pull_merge_instruction.tmpl	Fix agit checkout command line hint & fix ShowMergeInstructions checking (#31219)	8 months ago
reactions.tmpl	Rewrite and restyle reaction selector and enable no-sizzle eslint rule (#30453)	10 months ago
reference_issue_dialog.tmpl	Fix some UI problems (dropdown/container) (#30849)	9 months ago
show_role.tmpl	Add `member`, `collaborator`, `contributor`, and `first-time contributor` roles and tooltips (#26658)	1 year ago
sidebar.tmpl	Remove fomantic button module (#30475)	10 months ago
update_branch_by_merge.tmpl	Replace 10 more gt- classes with tw- (#29945)	11 months ago
watching.tmpl	Migrate margin and padding helpers to tailwind (#30043)	10 months ago