summaryrefslogtreecommitdiffstats
path: root/modules/convert
diff options
context:
space:
mode:
Diffstat (limited to 'modules/convert')
-rw-r--r--modules/convert/convert.go2
-rw-r--r--modules/convert/issue.go2
-rw-r--r--modules/convert/issue_comment.go3
-rw-r--r--modules/convert/repository.go2
4 files changed, 5 insertions, 4 deletions
diff --git a/modules/convert/convert.go b/modules/convert/convert.go
index 53357e7505..67b3902cd7 100644
--- a/modules/convert/convert.go
+++ b/modules/convert/convert.go
@@ -340,7 +340,7 @@ func ToTeams(teams []*organization.Team, loadOrgs bool) ([]*api.Team, error) {
if loadOrgs {
apiOrg, ok := cache[teams[i].OrgID]
if !ok {
- org, err := organization.GetOrgByID(teams[i].OrgID)
+ org, err := organization.GetOrgByID(db.DefaultContext, teams[i].OrgID)
if err != nil {
return nil, err
}
diff --git a/modules/convert/issue.go b/modules/convert/issue.go
index bf116e2283..a4512e424f 100644
--- a/modules/convert/issue.go
+++ b/modules/convert/issue.go
@@ -72,7 +72,7 @@ func ToAPIIssue(issue *models.Issue) *api.Issue {
apiIssue.Milestone = ToAPIMilestone(issue.Milestone)
}
- if err := issue.LoadAssignees(); err != nil {
+ if err := issue.LoadAssignees(db.DefaultContext); err != nil {
return &api.Issue{}
}
if len(issue.Assignees) > 0 {
diff --git a/modules/convert/issue_comment.go b/modules/convert/issue_comment.go
index 6d72849bca..eaa7f64ea3 100644
--- a/modules/convert/issue_comment.go
+++ b/modules/convert/issue_comment.go
@@ -6,6 +6,7 @@ package convert
import (
"code.gitea.io/gitea/models"
+ "code.gitea.io/gitea/models/db"
repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/log"
@@ -113,7 +114,7 @@ func ToTimelineComment(c *models.Comment, doer *user_model.User) *api.TimelineCo
}
if c.RefCommentID != 0 {
- com, err := models.GetCommentByID(c.RefCommentID)
+ com, err := models.GetCommentByID(db.DefaultContext, c.RefCommentID)
if err != nil {
log.Error("GetCommentByID(%d): %v", c.RefCommentID, err)
return nil
diff --git a/modules/convert/repository.go b/modules/convert/repository.go
index b813d69699..eb6bb37707 100644
--- a/modules/convert/repository.go
+++ b/modules/convert/repository.go
@@ -104,7 +104,7 @@ func innerToRepo(repo *repo_model.Repository, mode perm.AccessMode, isParent boo
var mirrorUpdated time.Time
if repo.IsMirror {
var err error
- repo.Mirror, err = repo_model.GetMirrorByRepoID(repo.ID)
+ repo.Mirror, err = repo_model.GetMirrorByRepoID(db.DefaultContext, repo.ID)
if err == nil {
mirrorInterval = repo.Mirror.Interval.String()
mirrorUpdated = repo.Mirror.UpdatedUnix.AsTime()