0
0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-15 05:06:48 +01:00
gitea/services/pull
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
..
check_test.go
check.go Fix misspelling of mergable (#30896) 2024-05-08 16:11:43 +00:00
comment.go Update misspell to 0.5.1 and add misspellings.csv (#30573) 2024-04-27 08:03:49 +00:00
commit_status_test.go
commit_status.go Use db.ListOptionsAll instead of db.ListOptions{ListAll: true} (#29995) 2024-03-22 13:53:52 +01:00
edits.go
lfs.go
main_test.go
merge_ff_only.go
merge_merge.go
merge_prepare.go
merge_rebase.go
merge_squash.go
merge_test.go
merge.go Allow including Reviewed-on/Reviewed-by lines for custom merge messages (#31211) 2024-06-06 08:35:04 +00:00
patch_unmerged.go
patch.go Make sure git version&feature are always prepared (#30877) 2024-05-06 18:34:16 +02:00
pull_test.go
pull.go Update misspell to 0.5.1 and add misspellings.csv (#30573) 2024-04-27 08:03:49 +00:00
review_test.go Prevent re-review and dismiss review actions on closed and merged PRs (#30065) 2024-03-28 15:19:24 +00:00
review.go Resolve lint for unused parameter and unnecessary type arguments (#30750) 2024-04-29 08:47:56 +00:00
temp_repo.go Make sure git version&feature are always prepared (#30877) 2024-05-06 18:34:16 +02:00
update_rebase.go Resolve lint for unused parameter and unnecessary type arguments (#30750) 2024-04-29 08:47:56 +00:00
update.go Move database operations of merging a pull request to post receive hook and add a transaction (#30805) 2024-05-07 07:36:48 +00:00