mirror/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-11-24 02:59:42 +08:00
Code Packages Projects Releases Wiki Activity
4f7d6feab7
gitea/services
History
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}
```
2024-06-06 08:35:04 +00:00
..
actions Improve the handling of jobs.<job_id>.if (#31070) 2024-05-27 14:15:34 +08:00
agit Performance optimization for git push (#30104) 2024-04-09 03:43:17 +00:00
asymkey Fix some pending problems (#29985) 2024-03-22 19:17:30 +08:00
attachment Add support for API blob upload of release attachments (#29507) 2024-03-02 17:02:01 +00:00
auth Fix tautological conditions (#30735) 2024-04-30 14:34:40 +02:00
automerge Fix automerge will not work because of some events haven't been triggered (#30780) 2024-05-21 23:23:22 +08:00
context Check if reverse proxy is correctly configured (#30890) 2024-05-10 20:07:01 +08:00
contexttest Check if reverse proxy is correctly configured (#30890) 2024-05-10 20:07:01 +08:00
convert Performance improvements for pull request list API (#30490) 2024-05-31 12:10:11 +00:00
cron Move some asymkey functions to service layer (#28894) 2024-03-04 08:57:39 +00:00
doctor Resolve lint for unused parameter and unnecessary type arguments (#30750) 2024-04-29 08:47:56 +00:00
externalaccount Revert "Support SAML authentication (#25165)" (#29358) 2024-02-24 12:18:49 +08:00
feed More db.DefaultContext refactor (#27265) 2023-09-29 12:12:54 +00:00
forms Rename project board -> column to make the UI less confusing (#30170) 2024-05-27 08:59:54 +00:00
gitdiff Update golangci-lint to v1.59.0 (#31221) 2024-06-03 07:04:35 +00:00
indexer Update issue indexer after merging a PR (#30715) 2024-05-08 14:45:15 +00:00
issue Performance improvements for pull request list API (#30490) 2024-05-31 12:10:11 +00:00
lfs Azure blob storage support (#30995) 2024-05-30 07:33:50 +00:00
mailer Add option for mailer to override mail headers (#27860) 2024-06-03 20:42:52 +02:00
markup Enable more revive linter rules (#30608) 2024-04-22 11:48:42 +00:00
migrations Add lint-go-gopls (#30729) 2024-06-05 09:22:38 +08:00
mirror Resolve lint for unused parameter and unnecessary type arguments (#30750) 2024-04-29 08:47:56 +00:00
notify Clean up log messages (#30313) 2024-04-07 19:17:06 +08:00
org Update misspell to 0.5.1 and add misspellings.csv (#30573) 2024-04-27 08:03:49 +00:00
packages remove util.OptionalBool and related functions (#29513) 2024-03-02 16:42:31 +01:00
pull Allow including Reviewed-on/Reviewed-by lines for custom merge messages (#31211) 2024-06-06 08:35:04 +00:00
release Check if the release is converted from the tag when updating the release (#30984) 2024-05-15 14:25:47 +00:00
repository Add lint-go-gopls (#30729) 2024-06-05 09:22:38 +08:00
secrets Refactor deletion (#28610) 2023-12-25 21:25:29 +01:00
task Fix "force private" logic (#31012) 2024-05-20 00:56:45 +00:00
uinotification Penultimate round of db.DefaultContext refactor (#27414) 2023-10-11 04:24:07 +00:00
user Fix bug on avatar (#31008) 2024-05-19 12:58:39 +08:00
webhook Enable more revive linter rules (#30608) 2024-04-22 11:48:42 +00:00
webtheme Initial support for colorblindness-friendly themes (#30625) 2024-04-24 00:18:41 +08:00
wiki Avoid showing Failed to change the default wiki branch if repo has no wiki when saving repo settings (#30329) 2024-04-08 19:43:23 +08:00