Skip to content

Commit 4e47148

Browse files
authored
Remove unnecessary duplicate code (#34552)
`GetIssuesLastCommitStatus` will revoke `GetIssuesAllCommitStatus` but it has been invoked. The `CommitStatus` template variable has never been used in notification subscription page so that it could be removed.
1 parent 375dab1 commit 4e47148

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

routers/web/user/notification.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -287,16 +287,8 @@ func NotificationSubscriptions(ctx *context.Context) {
287287
ctx.Data["CommitLastStatus"] = lastStatus
288288
ctx.Data["CommitStatuses"] = commitStatuses
289289
ctx.Data["Issues"] = issues
290-
291290
ctx.Data["IssueRefEndNames"], ctx.Data["IssueRefURLs"] = issue_service.GetRefEndNamesAndURLs(issues, "")
292291

293-
commitStatus, err := pull_service.GetIssuesLastCommitStatus(ctx, issues)
294-
if err != nil {
295-
ctx.ServerError("GetIssuesLastCommitStatus", err)
296-
return
297-
}
298-
ctx.Data["CommitStatus"] = commitStatus
299-
300292
approvalCounts, err := issues.GetApprovalCounts(ctx)
301293
if err != nil {
302294
ctx.ServerError("ApprovalCounts", err)

services/pull/pull.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -945,12 +945,6 @@ func GetSquashMergeCommitMessages(ctx context.Context, pr *issues_model.PullRequ
945945
return stringBuilder.String()
946946
}
947947

948-
// GetIssuesLastCommitStatus returns a map of issue ID to the most recent commit's latest status
949-
func GetIssuesLastCommitStatus(ctx context.Context, issues issues_model.IssueList) (map[int64]*git_model.CommitStatus, error) {
950-
_, lastStatus, err := GetIssuesAllCommitStatus(ctx, issues)
951-
return lastStatus, err
952-
}
953-
954948
// GetIssuesAllCommitStatus returns a map of issue ID to a list of all statuses for the most recent commit as well as a map of issue ID to only the commit's latest status
955949
func GetIssuesAllCommitStatus(ctx context.Context, issues issues_model.IssueList) (map[int64][]*git_model.CommitStatus, map[int64]*git_model.CommitStatus, error) {
956950
if err := issues.LoadPullRequests(ctx); err != nil {

0 commit comments

Comments
 (0)