Update

hiifong · hiifong · commit 11c3f7f900c0 · 2025-08-11T12:20:11.000+08:00
diff --git a/routers/web/repo/issue_view.go b/routers/web/repo/issue_view.go
@@ -1004,7 +1004,7 @@ func prepareIssueViewContent(ctx *context.Context, issue *issues_model.Issue) {
 	}
 }
 
-func getIssueViewSquashMergeCommits(ctx *context.Context, issue *issues_model.Issue) (string, error) {
+func getPullViewSquashMergeCommits(ctx *context.Context, issue *issues_model.Issue) (string, error) {
 	pull := issue.PullRequest
 	pull.Issue = issue
 
@@ -1033,7 +1033,7 @@ func preparePullViewSquashMergeMsg(ctx *context.Context, issue *issues_model.Iss
 		return
 	}
 
-	commitsMsg, err := getIssueViewSquashMergeCommits(ctx, issue)
+	commitsMsg, err := getPullViewSquashMergeCommits(ctx, issue)
 	if err != nil {
 		ctx.ServerError("getIssueViewSquashMergeCommits", err)
 		return

Original file line number	Diff line number	Diff line change
`@@ -1004,7 +1004,7 @@ func prepareIssueViewContent(ctx context.Context, issue issues_model.Issue) {`
`1004`	`1004`	`}`
`1005`	`1005`	`}`
`1006`	`1006`
`1007`		`-func getIssueViewSquashMergeCommits(ctx context.Context, issue issues_model.Issue) (string, error) {`
	`1007`	`+func getPullViewSquashMergeCommits(ctx context.Context, issue issues_model.Issue) (string, error) {`
`1008`	`1008`	`pull := issue.PullRequest`
`1009`	`1009`	`pull.Issue = issue`
`1010`	`1010`
`@@ -1033,7 +1033,7 @@ func preparePullViewSquashMergeMsg(ctx context.Context, issue issues_model.Iss`
`1033`	`1033`	`return`
`1034`	`1034`	`}`
`1035`	`1035`
`1036`		`- commitsMsg, err := getIssueViewSquashMergeCommits(ctx, issue)`
	`1036`	`+ commitsMsg, err := getPullViewSquashMergeCommits(ctx, issue)`
`1037`	`1037`	`if err != nil {`
`1038`	`1038`	`ctx.ServerError("getIssueViewSquashMergeCommits", err)`
`1039`	`1039`	`return`