diff --git a/services/issue/issue.go b/services/issue/issue.go index bc7b1ac5d9..b91ee4fc18 100644 --- a/services/issue/issue.go +++ b/services/issue/issue.go @@ -4,7 +4,6 @@ package issue import ( - "context" "fmt" activities_model "code.gitea.io/gitea/models/activities" @@ -133,17 +132,11 @@ func UpdateAssignees(issue *issues_model.Issue, oneAssignee string, multipleAssi // DeleteIssue deletes an issue func DeleteIssue(doer *user_model.User, gitRepo *git.Repository, issue *issues_model.Issue) error { - var ctx context.Context - if gitRepo == nil { - ctx = db.DefaultContext - } else { - ctx = gitRepo.Ctx - } // load issue before deleting it - if err := issue.LoadAttributes(ctx); err != nil { + if err := issue.LoadAttributes(gitRepo.Ctx); err != nil { return err } - if err := issue.LoadPullRequest(ctx); err != nil { + if err := issue.LoadPullRequest(gitRepo.Ctx); err != nil { return err } @@ -159,7 +152,7 @@ func DeleteIssue(doer *user_model.User, gitRepo *git.Repository, issue *issues_m } } - notification.NotifyDeleteIssue(ctx, doer, issue) + notification.NotifyDeleteIssue(gitRepo.Ctx, doer, issue) return nil }