1
0
Fork 0
forgejo/services
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
..
actions Improve the handling of jobs.<job_id>.if (#31070) 2024-06-02 09:08:07 +02:00
agit Use the database object format name but not read from git repoisitory everytime and fix possible migration wrong objectformat when migrating a sha256 repository (#29294) 2024-02-26 22:30:26 +01:00
asymkey Add codespell support and fix a good number of typos with its help (#3270) 2024-05-09 13:49:37 +00:00
attachment Add support for API blob upload of release attachments (#29507) 2024-03-06 12:10:46 +08:00
auth Fix tautological conditions (#30735) 2024-05-05 08:59:40 +01:00
automerge Fix automerge will not work because of some events haven't been triggered (#30780) 2024-05-26 19:01:36 +02:00
context ui for adding following repos 2024-05-24 13:28:15 +02:00
contexttest Move database operations of merging a pull request to post receive hook and add a transaction (#30805) 2024-05-12 20:03:10 +02:00
convert Make gitea webhooks openproject compatible (gitea#28435) 2024-06-05 15:58:51 +02:00
cron Update checker setting updates 2024-03-31 10:52:24 +05:00
doctor Add codespell support and fix a good number of typos with its help (#3270) 2024-05-09 13:49:37 +00:00
externalaccount Final round of db.DefaultContext refactor (#27587) 2023-10-14 08:37:24 +00:00
federation feat(federated-star) star repositories via ActivityPub (#1680) 2024-06-06 08:58:11 +02:00
feed More db.DefaultContext refactor (#27265) 2023-09-29 12:12:54 +00:00
forgejo [UPGRADE] run sanity checks before the database is upgraded 2024-02-05 14:44:33 +01:00
forms Add slogan config (#3752) 2024-06-07 17:12:48 +00:00
gitdiff chore(lint): make golangci-lint to v1.59.0 happy 2024-06-01 16:17:07 +02:00
indexer Update issue indexer after merging a PR (#30715) 2024-05-12 20:03:10 +02:00
issue Performance improvements for pull request list API (#30490) 2024-06-02 16:26:54 +02:00
lfs Move context from modules to services (#29440) 2024-03-06 12:10:43 +08:00
mailer test(services/mailer): Add option for mailer to override mail headers 2024-06-09 11:13:39 +02:00
markup Format code 2024-03-28 05:42:25 +01:00
migrations Add lint-go-gopls (#30729) 2024-06-09 11:13:39 +02:00
mirror test(mock): DeletePushMirrors & AddPushMirrorRemote 2024-06-02 16:31:41 +02:00
notify Clean up log messages (#30313) 2024-04-15 20:01:35 +02:00
org Delete repos of org when purge delete user (#27273) 2023-10-19 13:16:11 +00:00
packages packages: skip error logging on duplicate 2024-03-24 07:12:31 +01:00
pull Allow including Reviewed-on/Reviewed-by lines for custom merge messages (#31211) 2024-06-09 16:04:57 +02:00
release Fix release published actions not triggering for releases created from existing tags 2024-04-15 22:53:53 +02:00
remote Add codespell support and fix a good number of typos with its help (#3270) 2024-05-09 13:49:37 +00:00
repository Add lint-go-gopls (#30729) 2024-06-09 11:13:39 +02:00
secrets Refactor deletion (#28610) 2023-12-25 21:25:29 +01:00
task Fix "force private" logic (#31012) 2024-05-26 18:20:33 +02:00
uinotification Penultimate round of db.DefaultContext refactor (#27414) 2023-10-11 04:24:07 +00:00
user test(avatar): deleting a user avatar is idempotent 2024-06-05 09:10:42 +02:00
webhook test: webhook open project expected fields 2024-06-05 15:58:51 +02:00
wiki feat: wiki search using git-grep 2024-05-20 13:48:50 +00:00