mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-06-29 10:33:44 +02: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 |
||
|---|---|---|
| .. | ||
| check.go | ||
| check_test.go | ||
| comment.go | ||
| commit_status.go | ||
| commit_status_test.go | ||
| edits.go | ||
| lfs.go | ||
| main_test.go | ||
| merge.go | ||
| merge_ff_only.go | ||
| merge_merge.go | ||
| merge_prepare.go | ||
| merge_rebase.go | ||
| merge_squash.go | ||
| merge_test.go | ||
| patch.go | ||
| patch_unmerged.go | ||
| pull.go | ||
| pull_test.go | ||
| review.go | ||
| review_test.go | ||
| temp_repo.go | ||
| update.go | ||
| update_rebase.go | ||