aboutsummaryrefslogtreecommitdiff
path: root/models/pull.go
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2017-03-16 17:18:43 -0400
committerUnknwon <u@gogs.io>2017-03-16 17:18:43 -0400
commit0ccd7c97abcb1ae314c9c17b0c08863cb13115fa (patch)
treed5314ef88257d64b3749194c024ca853486f799e /models/pull.go
parent4e64e71e28dcfb9ef41d7cbc63ff1474ad8e5126 (diff)
models: rename ErrUserNotExist -> errors.UserNotExist
Diffstat (limited to 'models/pull.go')
-rw-r--r--models/pull.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/models/pull.go b/models/pull.go
index d1c5078d..f36a0e18 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -18,6 +18,7 @@ import (
"github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/process"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/modules/sync"
@@ -101,7 +102,7 @@ func (pr *PullRequest) loadAttributes(e Engine) (err error) {
if pr.HasMerged && pr.Merger == nil {
pr.Merger, err = getUserByID(e, pr.MergerID)
- if IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
pr.MergerID = -1
pr.Merger = NewGhostUser()
} else if err != nil {