mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-04-14 02:51:35 +02:00
fix(pr): default commit texts should not depend on default merge strategy
This commit is contained in:
parent
49ea851da9
commit
66b8e52415
1 changed files with 1 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue