mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-28 15:43:17 +01:00
4ddd9af50f
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 |
||
|---|---|---|
| .. | ||
| actions | ||
| branch | ||
| cite | ||
| code | ||
| diff | ||
| editor | ||
| find | ||
| graph | ||
| issue | ||
| migrate | ||
| projects | ||
| pulls | ||
| release | ||
| settings | ||
| tag | ||
| wiki | ||
| activity.tmpl | ||
| admin_flags.tmpl | ||
| blame.tmpl | ||
| branch_dropdown.tmpl | ||
| clone_buttons.tmpl | ||
| clone_script.tmpl | ||
| code_frequency.tmpl | ||
| commit_load_branches_and_tags.tmpl | ||
| commit_page.tmpl | ||
| commit_status.tmpl | ||
| commit_statuses.tmpl | ||
| commits.tmpl | ||
| commits_list.tmpl | ||
| commits_list_small.tmpl | ||
| commits_search_dropdown.tmpl | ||
| commits_table.tmpl | ||
| contributors.tmpl | ||
| create.tmpl | ||
| create_helper.tmpl | ||
| empty.tmpl | ||
| file_info.tmpl | ||
| flags.tmpl | ||
| forks.tmpl | ||
| graph.tmpl | ||
| header.tmpl | ||
| header_fork.tmpl | ||
| home.tmpl | ||
| icon.tmpl | ||
| latest_commit.tmpl | ||
| navbar.tmpl | ||
| packages.tmpl | ||
| pulse.tmpl | ||
| recent_commits.tmpl | ||
| release_tag_header.tmpl | ||
| search.tmpl | ||
| search_name.tmpl | ||
| shabox_badge.tmpl | ||
| star_unstar.tmpl | ||
| sub_menu.tmpl | ||
| unicode_escape_prompt.tmpl | ||
| upload.tmpl | ||
| user_cards.tmpl | ||
| view_file.tmpl | ||
| view_list.tmpl | ||
| watch_unwatch.tmpl | ||
| watchers.tmpl | ||