From 66b8e5241562bb3e9b0e8c164d70795b6cd02284 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sun, 30 Mar 2025 15:15:33 +0500 Subject: [PATCH] fix(pr): default commit texts should not depend on default merge strategy --- routers/web/repo/issue.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index e51d143ede..bc2c1966cb 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -1938,7 +1938,7 @@ func ViewIssue(ctx *context.Context) { } ctx.Data["UpdateStyle"] = updateStyle - defaultMergeMessage, defaultMergeBody, err := pull_service.GetDefaultMergeMessage(ctx, ctx.Repo.GitRepo, pull, mergeStyle) + defaultMergeMessage, defaultMergeBody, err := pull_service.GetDefaultMergeMessage(ctx, ctx.Repo.GitRepo, pull, repo_model.MergeStyleMerge) if err != nil { ctx.ServerError("GetDefaultMergeMessage", err) return