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.

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
..
check.go	Fix misspelling of mergable (#30896)	9 months ago
check_test.go	Replace assert.Fail with assert.FailNow (#27578)	1 year ago
comment.go	Update misspell to 0.5.1 and add `misspellings.csv` (#30573)	9 months ago
commit_status.go	Use db.ListOptionsAll instead of db.ListOptions{ListAll: true} (#29995)	11 months ago
commit_status_test.go	Fixing the issue when status check per rule matches multiple actions (#29631)	11 months ago
edits.go	Implement FSFE REUSE for golang files (#21840)	2 years ago
lfs.go	Remove GetByBean method because sometimes it's danger when query condition parameter is zero and also introduce new generic methods (#28220)	1 year ago
main_test.go	make writing main test easier (#27270)	1 year ago
merge.go	Allow including `Reviewed-on`/`Reviewed-by` lines for custom merge messages (#31211)	8 months ago
merge_ff_only.go	Add merge style `fast-forward-only` (#28954)	12 months ago
merge_merge.go	Add merge style `fast-forward-only` (#28954)	12 months ago
merge_prepare.go	Refactor merge/update git command calls (#23366)	2 years ago
merge_rebase.go	Simplify how git repositories are opened (#28937)	1 year ago
merge_squash.go	Simplify how git repositories are opened (#28937)	1 year ago
merge_test.go	Support template for merge message description (#22248)	2 years ago
patch.go	Make sure git version&feature are always prepared (#30877)	9 months ago
patch_unmerged.go	Implement FSFE REUSE for golang files (#21840)	2 years ago
pull.go	Update misspell to 0.5.1 and add `misspellings.csv` (#30573)	9 months ago
pull_test.go	Simplify how git repositories are opened (#28937)	1 year ago
review.go	Resolve lint for unused parameter and unnecessary type arguments (#30750)	9 months ago
review_test.go	Prevent re-review and dismiss review actions on closed and merged PRs (#30065)	10 months ago
temp_repo.go	Make sure git version&feature are always prepared (#30877)	9 months ago
update.go	Move database operations of merging a pull request to post receive hook and add a transaction (#30805)	9 months ago
update_rebase.go	Resolve lint for unused parameter and unnecessary type arguments (#30750)	9 months ago