diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2022-04-08 17:11:15 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-08 17:11:15 +0800 |
| commit | 1dfa26e00e8e1ce6f6125335871da1d402a63466 (patch) | |
| tree | d39414fb085ae52d6633ae9d064aabab2e7f75f8 /services/pull | |
| parent | 84ceaa98bd731431c7d3a7f65e59e7ad076a540f (diff) | |
| download | gitea-1dfa26e00e8e1ce6f6125335871da1d402a63466.tar.gz gitea-1dfa26e00e8e1ce6f6125335871da1d402a63466.zip | |
Move milestone to models/issues/ (#19278)
* Move milestone to models/issues/
* Fix lint
* Fix test
* Fix lint
* Fix lint
Diffstat (limited to 'services/pull')
| -rw-r--r-- | services/pull/merge.go | 4 | ||||
| -rw-r--r-- | services/pull/review.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/services/pull/merge.go b/services/pull/merge.go index 6ecb3cf08e..0c615d93c8 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -76,7 +76,7 @@ func Merge(ctx context.Context, pr *models.PullRequest, doer *user_model.User, b log.Error("loadIssue [%d]: %v", pr.ID, err) } - if err := pr.Issue.LoadRepo(); err != nil { + if err := pr.Issue.LoadRepo(ctx); err != nil { log.Error("loadRepo for issue [%d]: %v", pr.ID, err) } if err := pr.Issue.Repo.GetOwner(ctx); err != nil { @@ -99,7 +99,7 @@ func Merge(ctx context.Context, pr *models.PullRequest, doer *user_model.User, b if err = ref.LoadIssue(); err != nil { return err } - if err = ref.Issue.LoadRepo(); err != nil { + if err = ref.Issue.LoadRepo(ctx); err != nil { return err } close := ref.RefAction == references.XRefActionCloses diff --git a/services/pull/review.go b/services/pull/review.go index cb21d736cf..e7e6f3135b 100644 --- a/services/pull/review.go +++ b/services/pull/review.go @@ -44,7 +44,7 @@ func CreateCodeComment(ctx context.Context, doer *user_model.User, gitRepo *git. // Comments that are replies don't require a review header to show up in the issue view if !isReview && existsReview { - if err = issue.LoadRepo(); err != nil { + if err = issue.LoadRepo(ctx); err != nil { return nil, err } |