Skip to content

Commit 5039cc9

Browse files
committed
Update
1 parent 1e67f18 commit 5039cc9

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

routers/web/repo/issue_view.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ func ViewIssue(ctx *context.Context) {
392392
}
393393

394394
if issue.IsPull {
395-
prepareFuncs = append(prepareFuncs, prepareIssueViewSquashMergeMsg)
395+
prepareFuncs = append(prepareFuncs, preparePullViewSquashMergeMsg)
396396
}
397397

398398
for _, prepareFunc := range prepareFuncs {
@@ -446,7 +446,7 @@ func ViewPullMergeBox(ctx *context.Context) {
446446
}
447447
preparePullViewPullInfo(ctx, issue)
448448
preparePullViewReviewAndMerge(ctx, issue)
449-
prepareIssueViewSquashMergeMsg(ctx, issue)
449+
preparePullViewSquashMergeMsg(ctx, issue)
450450
ctx.Data["PullMergeBoxReloading"] = issue.PullRequest.IsChecking()
451451

452452
// TODO: it should use a dedicated struct to render the pull merge box, to make sure all data is prepared correctly
@@ -1024,7 +1024,7 @@ func getIssueViewSquashMergeCommits(ctx *context.Context, issue *issues_model.Is
10241024
return commits, nil
10251025
}
10261026

1027-
func prepareIssueViewSquashMergeMsg(ctx *context.Context, issue *issues_model.Issue) {
1027+
func preparePullViewSquashMergeMsg(ctx *context.Context, issue *issues_model.Issue) {
10281028
pull := issue.PullRequest
10291029

10301030
defaultSquashMergeMessage, defaultSquashMergeBody, err := pull_service.GetDefaultMergeMessage(ctx, ctx.Repo.GitRepo, pull, repo_model.MergeStyleSquash)

0 commit comments

Comments
 (0)