diff options
Diffstat (limited to 'modules/convert/pull.go')
| -rw-r--r-- | modules/convert/pull.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/convert/pull.go b/modules/convert/pull.go index 0f2b5af1b4..f892107f4b 100644 --- a/modules/convert/pull.go +++ b/modules/convert/pull.go @@ -8,6 +8,7 @@ import ( "fmt" "code.gitea.io/gitea/models" + user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" api "code.gitea.io/gitea/modules/structs" @@ -16,7 +17,7 @@ import ( // ToAPIPullRequest assumes following fields have been assigned with valid values: // Required - Issue // Optional - Merger -func ToAPIPullRequest(pr *models.PullRequest, doer *models.User) *api.PullRequest { +func ToAPIPullRequest(pr *models.PullRequest, doer *user_model.User) *api.PullRequest { var ( baseBranch *git.Branch headBranch *git.Branch |