diff options
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/api/v1/admin/org_repo.go | 3 | ||||
| -rw-r--r-- | routers/api/v1/api.go | 2 | ||||
| -rw-r--r-- | routers/api/v1/repo/repo.go | 2 | ||||
| -rw-r--r-- | routers/org/teams.go | 2 | ||||
| -rw-r--r-- | routers/repo/http.go | 2 | ||||
| -rw-r--r-- | routers/repo/pull.go | 4 |
6 files changed, 8 insertions, 7 deletions
diff --git a/routers/api/v1/admin/org_repo.go b/routers/api/v1/admin/org_repo.go index 71c84ad0..050f4577 100644 --- a/routers/api/v1/admin/org_repo.go +++ b/routers/api/v1/admin/org_repo.go @@ -6,13 +6,14 @@ package admin import ( "github.com/gogits/gogs/models" + "github.com/gogits/gogs/models/errors" "github.com/gogits/gogs/modules/context" ) func GetRepositoryByParams(ctx *context.APIContext) *models.Repository { repo, err := models.GetRepositoryByName(ctx.Org.Team.OrgID, ctx.Params(":reponame")) if err != nil { - if models.IsErrRepoNotExist(err) { + if errors.IsRepoNotExist(err) { ctx.Status(404) } else { ctx.Error(500, "GetRepositoryByName", err) diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 6a9c5441..ad235540 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -52,7 +52,7 @@ func repoAssignment() macaron.Handler { // Get repository. repo, err := models.GetRepositoryByName(owner.ID, repoName) if err != nil { - if models.IsErrRepoNotExist(err) { + if errors.IsRepoNotExist(err) { ctx.Status(404) } else { ctx.Error(500, "GetRepositoryByName", err) diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index 7ff47a2d..99ae391d 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -291,7 +291,7 @@ func parseOwnerAndRepo(ctx *context.APIContext) (*models.User, *models.Repositor repo, err := models.GetRepositoryByName(owner.ID, ctx.Params(":reponame")) if err != nil { - if models.IsErrRepoNotExist(err) { + if errors.IsRepoNotExist(err) { ctx.Status(404) } else { ctx.Error(500, "GetRepositoryByName", err) diff --git a/routers/org/teams.go b/routers/org/teams.go index 503739de..abd2fd9e 100644 --- a/routers/org/teams.go +++ b/routers/org/teams.go @@ -121,7 +121,7 @@ func TeamsRepoAction(ctx *context.Context) { var repo *models.Repository repo, err = models.GetRepositoryByName(ctx.Org.Organization.ID, repoName) if err != nil { - if models.IsErrRepoNotExist(err) { + if errors.IsRepoNotExist(err) { ctx.Flash.Error(ctx.Tr("org.teams.add_nonexistent_repo")) ctx.Redirect(ctx.Org.OrgLink + "/teams/" + ctx.Org.Team.LowerName + "/repositories") return diff --git a/routers/repo/http.go b/routers/repo/http.go index b385a13a..e1cc5f96 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -66,7 +66,7 @@ func HTTPContexter() macaron.Handler { repo, err := models.GetRepositoryByName(owner.ID, repoName) if err != nil { - ctx.NotFoundOrServerError("GetRepositoryByName", models.IsErrRepoNotExist, err) + ctx.NotFoundOrServerError("GetRepositoryByName", errors.IsRepoNotExist, err) return } diff --git a/routers/repo/pull.go b/routers/repo/pull.go index aa61dcd9..51d34877 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -42,7 +42,7 @@ var ( func parseBaseRepository(ctx *context.Context) *models.Repository { baseRepo, err := models.GetRepositoryByID(ctx.ParamsInt64(":repoid")) if err != nil { - ctx.NotFoundOrServerError("GetRepositoryByID", models.IsErrRepoNotExist, err) + ctx.NotFoundOrServerError("GetRepositoryByID", errors.IsRepoNotExist, err) return nil } @@ -718,7 +718,7 @@ func parseOwnerAndRepo(ctx *context.Context) (*models.User, *models.Repository) repo, err := models.GetRepositoryByName(owner.ID, ctx.Params(":reponame")) if err != nil { - ctx.NotFoundOrServerError("GetRepositoryByName", models.IsErrRepoNotExist, err) + ctx.NotFoundOrServerError("GetRepositoryByName", errors.IsRepoNotExist, err) return nil, nil } |