gitea

18,900 Commits 19 Branches 243 Tags

2 Commits

Author SHA1 Message Date

Author	SHA1	Message	Date
Max WipfliandGitHub	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
Max WipfliandGitHub	3cc7f763c3	Only update poster in issue/comment list if it has been loaded (#31216 ) Previously, all posters were updated, even if they were not part of posterMaps. In that case, a ghost user was erroneously inserted. Fixes #31213.	2024-06-02 10:32:20 +08:00

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

Max WipfliandGitHub

3cc7f763c3

Only update poster in issue/comment list if it has been loaded (#31216 )

Previously, all posters were updated, even if they were not part of
posterMaps. In that case, a ghost user was erroneously inserted.

Fixes #31213.

2024-06-02 10:32:20 +08:00