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.
gitea/services
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
..
actions Improve the handling of `jobs.<job_id>.if` (#31070) 8 months ago
agit Performance optimization for git push (#30104) 10 months ago
asymkey Fix some pending problems (#29985) 11 months ago
attachment Add support for API blob upload of release attachments (#29507) 11 months ago
auth Fix tautological conditions (#30735) 9 months ago
automerge Fix automerge will not work because of some events haven't been triggered (#30780) 9 months ago
context Check if reverse proxy is correctly configured (#30890) 9 months ago
contexttest Check if reverse proxy is correctly configured (#30890) 9 months ago
convert Performance improvements for pull request list API (#30490) 8 months ago
cron Move some asymkey functions to service layer (#28894) 11 months ago
doctor Resolve lint for unused parameter and unnecessary type arguments (#30750) 9 months ago
externalaccount Revert "Support SAML authentication (#25165)" (#29358) 11 months ago
feed More `db.DefaultContext` refactor (#27265) 1 year ago
forms Rename project board -> column to make the UI less confusing (#30170) 8 months ago
gitdiff Update golangci-lint to v1.59.0 (#31221) 8 months ago
indexer Update issue indexer after merging a PR (#30715) 9 months ago
issue Performance improvements for pull request list API (#30490) 8 months ago
lfs Azure blob storage support (#30995) 8 months ago
mailer Add option for mailer to override mail headers (#27860) 8 months ago
markup Enable more `revive` linter rules (#30608) 9 months ago
migrations Add `lint-go-gopls` (#30729) 8 months ago
mirror Resolve lint for unused parameter and unnecessary type arguments (#30750) 9 months ago
notify Clean up log messages (#30313) 10 months ago
org Update misspell to 0.5.1 and add `misspellings.csv` (#30573) 9 months ago
packages remove util.OptionalBool and related functions (#29513) 11 months ago
pull Allow including `Reviewed-on`/`Reviewed-by` lines for custom merge messages (#31211) 8 months ago
release Check if the release is converted from the tag when updating the release (#30984) 9 months ago
repository Add `lint-go-gopls` (#30729) 8 months ago
secrets Refactor deletion (#28610) 1 year ago
task Fix "force private" logic (#31012) 9 months ago
uinotification Penultimate round of `db.DefaultContext` refactor (#27414) 1 year ago
user Fix bug on avatar (#31008) 9 months ago
webhook Enable more `revive` linter rules (#30608) 9 months ago
webtheme Initial support for colorblindness-friendly themes (#30625) 9 months ago
wiki Avoid showing `Failed to change the default wiki branch` if repo has no wiki when saving repo settings (#30329) 10 months ago