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

Keep the same behavior as 1.16

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>

diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index 2a961c3cbc554e9e5b5ebe505c780a23a4267159..7c140a4e5991ef496f9c791c15844f5937502468 100644 (file)
--- 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
index 59e0962d1795d1646be8a4f4acc185a2e29fc0fe..fd901f013ebdb5204698e935ab18357a1db2a81f 100644 (file)
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -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,
                                                                        },
                                                                        {