Fix bug with globally disabling mirror (#11760)

6543 · web-flow · commit 2c5b3c72e8eb · 2020-06-04T19:06:24.000+01:00
Ensure we return after `ctx.Error(...)`
diff --git a/routers/api/v1/misc/settings.go b/routers/api/v1/misc/settings.go
@@ -5,6 +5,8 @@
 package misc
 
 import (
+	"net/http"
+
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/setting"
 )
@@ -19,5 +21,5 @@ func SettingGetsAllowedReactions(ctx *context.APIContext) {
 	// responses:
 	//   "200":
 	//     "$ref": "#/responses/StringSlice"
-	ctx.JSON(200, setting.UI.Reactions)
+	ctx.JSON(http.StatusOK, setting.UI.Reactions)
 }
diff --git a/routers/api/v1/repo/migrate.go b/routers/api/v1/repo/migrate.go
@@ -115,6 +115,7 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) {
 
 	if form.Mirror && setting.Repository.DisableMirrors {
 		ctx.Error(http.StatusForbidden, "MirrorsGlobalDisabled", fmt.Errorf("the site administrator has disabled mirrors"))
+		return
 	}
 
 	var opts = migrations.MigrateOptions{

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`package misc`
`6`	`6`
`7`	`7`	`import (`
	`8`	`+ "net/http"`
	`9`	`+`
`8`	`10`	`"code.gitea.io/gitea/modules/context"`
`9`	`11`	`"code.gitea.io/gitea/modules/setting"`
`10`	`12`	`)`
`@@ -19,5 +21,5 @@ func SettingGetsAllowedReactions(ctx *context.APIContext) {`
`19`	`21`	`// responses:`
`20`	`22`	`// "200":`
`21`	`23`	`// "$ref": "#/responses/StringSlice"`
`22`		`- ctx.JSON(200, setting.UI.Reactions)`
	`24`	`+ ctx.JSON(http.StatusOK, setting.UI.Reactions)`
`23`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) {`
`115`	`115`
`116`	`116`	`if form.Mirror && setting.Repository.DisableMirrors {`
`117`	`117`	`ctx.Error(http.StatusForbidden, "MirrorsGlobalDisabled", fmt.Errorf("the site administrator has disabled mirrors"))`
	`118`	`+ return`
`118`	`119`	`}`
`119`	`120`
`120`	`121`	`var opts = migrations.MigrateOptions{`