Add default commit messages to PR for squash merge (#20618) (#20645)

wxiaoguang · tyroneyeh · jolheiser · web-flow · commit 76accb51ed23 · 2022-08-04T11:11:59.000+08:00
Keep the same behavior as 1.16

Co-authored-by: wxiaoguang &lt;wxiaoguang@gmail.com&gt;
Co-authored-by: John Olheiser &lt;john.olheiser@gmail.com&gt;

Co-authored-by: Tyrone Yeh &lt;tyrone_yeh@draytek.com&gt;
Co-authored-by: John Olheiser &lt;john.olheiser@gmail.com&gt;
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
@@ -510,6 +510,8 @@ func PrepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *git.C
 			return nil
 		}
 		ctx.Data["GetCommitMessages"] = pull_service.GetSquashMergeCommitMessages(ctx, pull)
+	} else {
+		ctx.Data["GetCommitMessages"] = ""
 	}
 
 	sha, err := baseGitRepo.GetRefCommitID(pull.GetGitRefName())
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
@@ -396,7 +396,7 @@
 										'allowed': {{$prUnit.PullRequestsConfig.AllowSquash}},
 										'textDoMerge': {{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}},
 										'mergeTitleFieldText': defaultSquashMergeTitle,
-										'mergeMessageFieldText': defaultMergeMessage,
+										'mergeMessageFieldText': {{.GetCommitMessages}} + defaultMergeMessage,
 										'hideAutoMerge': generalHideAutoMerge,
 									},
 									{

Original file line number	Diff line number	Diff line change
`@@ -510,6 +510,8 @@ func PrepareViewPullInfo(ctx context.Context, issue issues_model.Issue) *git.C`
`510`	`510`	`return nil`
`511`	`511`	`}`
`512`	`512`	`ctx.Data["GetCommitMessages"] = pull_service.GetSquashMergeCommitMessages(ctx, pull)`
	`513`	`+ } else {`
	`514`	`+ ctx.Data["GetCommitMessages"] = ""`
`513`	`515`	`}`
`514`	`516`
`515`	`517`	`sha, err := baseGitRepo.GetRefCommitID(pull.GetGitRefName())`
Original file line number	Diff line number	Diff line change
`@@ -396,7 +396,7 @@`
`396`	`396`	`'allowed': {{$prUnit.PullRequestsConfig.AllowSquash}},`
`397`	`397`	`'textDoMerge': {{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}},`
`398`	`398`	`'mergeTitleFieldText': defaultSquashMergeTitle,`
`399`		`- 'mergeMessageFieldText': defaultMergeMessage,`
	`399`	`+ 'mergeMessageFieldText': {{.GetCommitMessages}} + defaultMergeMessage,`
`400`	`400`	`'hideAutoMerge': generalHideAutoMerge,`
`401`	`401`	`},`
`402`	`402`	`{`