Skip to content

Commit b09ada6

Browse files
committed
fix test
1 parent 05c4db8 commit b09ada6

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

routers/web/repo/issue_view.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -949,6 +949,9 @@ func preparePullViewReviewAndMerge(ctx *context.Context, issue *issues_model.Iss
949949

950950
ctx.Data["DefaultSquashMergeMessage"] = defaultSquashMergeMessage
951951
ctx.Data["DefaultSquashMergeBody"] = fmt.Sprintf("--------------------\n%s%s", commitsBuilder.String(), defaultSquashMergeBody)
952+
if len(pull.Issue.Content) == 0 {
953+
ctx.Data["DefaultSquashMergeBody"] = fmt.Sprintf("%s%s", commitsBuilder.String(), defaultSquashMergeBody)
954+
}
952955

953956
pb, err := git_model.GetFirstMatchProtectedBranchRule(ctx, pull.BaseRepoID, pull.BaseBranch)
954957
if err != nil {

0 commit comments

Comments
 (0)