diff options
| author | Unknwon <u@gogs.io> | 2015-07-09 11:15:08 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-07-09 11:15:08 +0800 |
| commit | b60fd3aaadc3e6ad227b663d599e073f1436fd1f (patch) | |
| tree | 3aa7a1e26cd878c09a52078d5aa202489122f27c /routers/api/v1/repo.go | |
| parent | 3be3b8faa7b1fa8fcac0bec49f2a37e861b4353d (diff) | |
| parent | 4fca548ed11cefedcaa595be1c08625a9ae9f878 (diff) | |
Merge branch 'master' of github.com:gogits/gogs
Diffstat (limited to 'routers/api/v1/repo.go')
| -rw-r--r-- | routers/api/v1/repo.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/routers/api/v1/repo.go b/routers/api/v1/repo.go index d7cc5955..7da5f817 100644 --- a/routers/api/v1/repo.go +++ b/routers/api/v1/repo.go @@ -105,7 +105,8 @@ func createRepo(ctx *middleware.Context, owner *models.User, opt api.CreateRepoO opt.Gitignore, opt.License, opt.Private, false, opt.AutoInit) if err != nil { if err == models.ErrRepoAlreadyExist || - err == models.ErrRepoNameIllegal { + models.IsErrNameReserved(err) || + models.IsErrNamePatternNotAllowed(err) { ctx.JSON(422, &base.ApiJsonErr{err.Error(), base.DOC_URL}) } else { log.Error(4, "CreateRepository: %v", err) @@ -163,7 +164,7 @@ func MigrateRepo(ctx *middleware.Context, form auth.MigrateRepoForm) { } return } - if !u.ValidtePassword(ctx.Query("password")) { + if !u.ValidatePassword(ctx.Query("password")) { ctx.HandleAPI(422, "Username or password is not correct.") return } |