Add "\n" after title unconditionally in case the message is empty

tclin914 · tclin914 · commit cfd13c1bfa4f · 2025-05-21T09:31:53.000+08:00
If the message from form.MergeMessageField is empty, we will miss a "\n"
between the title and the "Co-authored-by:" line. The title and message
should have a blank line between of them.
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
@@ -1109,8 +1109,9 @@ func MergePullRequest(ctx *context.Context) {
 	}
 
 	form.MergeMessageField = strings.TrimSpace(form.MergeMessageField)
+	message += "\n"
 	if len(form.MergeMessageField) > 0 {
-		message += "\n\n" + form.MergeMessageField
+		message += "\n" + form.MergeMessageField
 	}
 
 	if form.MergeWhenChecksSucceed {

Original file line number	Diff line number	Diff line change
`@@ -1109,8 +1109,9 @@ func MergePullRequest(ctx *context.Context) {`
`1109`	`1109`	`}`
`1110`	`1110`
`1111`	`1111`	`form.MergeMessageField = strings.TrimSpace(form.MergeMessageField)`
	`1112`	`+ message += "\n"`
`1112`	`1113`	`if len(form.MergeMessageField) > 0 {`
`1113`		`- message += "\n\n" + form.MergeMessageField`
	`1114`	`+ message += "\n" + form.MergeMessageField`
`1114`	`1115`	`}`
`1115`	`1116`
`1116`	`1117`	`if form.MergeWhenChecksSucceed {`