From cfd13c1bfa4f655663b1f0f4ee07ee70f345d02a Mon Sep 17 00:00:00 2001 From: Jim Lin Date: Wed, 21 May 2025 09:21:22 +0800 Subject: [PATCH] Add "\n" after title unconditionally in case the message is empty 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. --- routers/web/repo/pull.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 43ddc265cfafb..012c75983e17b 100644 --- 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 {