Keep the same behavior as 1.16 Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: John Olheiser <john.olheiser@gmail.com>tags/v1.18.0-rc0
@@ -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()) |
@@ -395,7 +395,7 @@ | |||
'allowed': {{$prUnit.PullRequestsConfig.AllowSquash}}, | |||
'textDoMerge': {{$.locale.Tr "repo.pulls.squash_merge_pull_request"}}, | |||
'mergeTitleFieldText': defaultSquashMergeTitle, | |||
'mergeMessageFieldText': defaultMergeMessage, | |||
'mergeMessageFieldText': {{.GetCommitMessages}} + defaultMergeMessage, | |||
'hideAutoMerge': generalHideAutoMerge, | |||
}, | |||
{ |