diff --git a/docs/content/usage/merge-message-templates.en-us.md b/docs/content/usage/merge-message-templates.en-us.md index fbdbd136f858a..2cb5d6e2eb665 100644 --- a/docs/content/usage/merge-message-templates.en-us.md +++ b/docs/content/usage/merge-message-templates.en-us.md @@ -44,6 +44,8 @@ You can use the following variables enclosed in `${}` inside these templates whi - PullRequestIndex: Pull request's index number - PullRequestReference: Pull request's reference char with index number. i.e. #1, !2 - ClosingIssues: return a string contains all issues which will be closed by this pull request i.e. `close #1, close #2` +- ReviewedOnTrailer: Message trailer including pull request URL, i.e. `Reviewed-on: https://gitea.com/foo/bar/pulls/1` +- ReviewedByTrailer: Message trailer including pull request approvers, i.e.,`Reviewed-by: Jane Doe ` ## Rebase diff --git a/services/pull/merge.go b/services/pull/merge.go index ea3efd6f6dc77..a8d33ea27340c 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -80,6 +80,8 @@ func getMergeMessage(ctx context.Context, baseGitRepo *git.Repository, pr *issue "PullRequestPosterName": pr.Issue.Poster.Name, "PullRequestIndex": strconv.FormatInt(pr.Index, 10), "PullRequestReference": fmt.Sprintf("%s%d", issueReference, pr.Index), + "ReviewedOnTrailer": reviewedOnTrailer, + "ReviewedByTrailer": reviewedByTrailer, } if pr.HeadRepo != nil { vars["HeadRepoOwnerName"] = pr.HeadRepo.OwnerName