Skip to content

Commit 1f0dca4

Browse files
author
Gusted
authored
Mark TemplateLoading error as "UnprocessableEntity" (#19445) (#19446)
* Mark TemplateLoading error as "UnprocessableEntity" (#19445) - Backport #19445 - Don't return Internal Server error if the user provide incorrect label template, instead return UnprocessableEntity. - Resolves #19399 - dep: upgrade: github.com/gogs/chardet
1 parent 1d665da commit 1f0dca4

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require (
3737
github.com/go-swagger/go-swagger v0.27.0
3838
github.com/go-testfixtures/testfixtures/v3 v3.6.1
3939
github.com/gobwas/glob v0.2.3
40-
github.com/gogs/chardet v0.0.0-20191104214054-4b6791f73a28
40+
github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f
4141
github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
4242
github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
4343
github.com/golang-jwt/jwt/v4 v4.3.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,8 +649,8 @@ github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP
649649
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
650650
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
651651
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
652-
github.com/gogs/chardet v0.0.0-20191104214054-4b6791f73a28 h1:gBeyun7mySAKWg7Fb0GOcv0upX9bdaZScs8QcRo8mEY=
653-
github.com/gogs/chardet v0.0.0-20191104214054-4b6791f73a28/go.mod h1:Pcatq5tYkCW2Q6yrR2VRHlbHpZ/R4/7qyL1TCF7vl14=
652+
github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f h1:3BSP1Tbs2djlpprl7wCLuiqMaUh5SJkkzI2gDs+FgLs=
653+
github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f/go.mod h1:Pcatq5tYkCW2Q6yrR2VRHlbHpZ/R4/7qyL1TCF7vl14=
654654
github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14 h1:yXtpJr/LV6PFu4nTLgfjQdcMdzjbqqXMEnHfq0Or6p8=
655655
github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14/go.mod h1:jPoNZLWDAqA5N3G5amEoiNbhVrmM+ZQEcnQvNQ2KaZk=
656656
github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85 h1:UjoPNDAQ5JPCjlxoJd6K8ALZqSDDhk2ymieAZOVaDg0=

routers/api/v1/repo/repo.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func Search(ctx *context.APIContext) {
160160
opts.Collaborate = util.OptionalBoolFalse
161161
}
162162

163-
var mode = ctx.FormString("mode")
163+
mode := ctx.FormString("mode")
164164
switch mode {
165165
case "source":
166166
opts.Fork = util.OptionalBoolFalse
@@ -186,9 +186,9 @@ func Search(ctx *context.APIContext) {
186186
opts.IsPrivate = util.OptionalBoolOf(ctx.FormBool("is_private"))
187187
}
188188

189-
var sortMode = ctx.FormString("sort")
189+
sortMode := ctx.FormString("sort")
190190
if len(sortMode) > 0 {
191-
var sortOrder = ctx.FormString("order")
191+
sortOrder := ctx.FormString("order")
192192
if len(sortOrder) == 0 {
193193
sortOrder = "asc"
194194
}
@@ -264,7 +264,8 @@ func CreateUserRepo(ctx *context.APIContext, owner *user_model.User, opt api.Cre
264264
if repo_model.IsErrRepoAlreadyExist(err) {
265265
ctx.Error(http.StatusConflict, "", "The repository with the same name already exists.")
266266
} else if db.IsErrNameReserved(err) ||
267-
db.IsErrNamePatternNotAllowed(err) {
267+
db.IsErrNamePatternNotAllowed(err) ||
268+
models.IsErrIssueLabelTemplateLoad(err) {
268269
ctx.Error(http.StatusUnprocessableEntity, "", err)
269270
} else {
270271
ctx.Error(http.StatusInternalServerError, "CreateRepository", err)

0 commit comments

Comments
 (0)