Browse Source

Fix bug with globally disabling mirror (#11760)

Ensure we return after `ctx.Error(...)`
pull/11769/head
6543 1 month ago
committed by GitHub
parent
commit
2c5b3c72e8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
  1. +3
    -1
      routers/api/v1/misc/settings.go
  2. +1
    -0
      routers/api/v1/repo/migrate.go

+ 3
- 1
routers/api/v1/misc/settings.go View File

@@ -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)
}

+ 1
- 0
routers/api/v1/repo/migrate.go View File

@@ -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{


Loading…
Cancel
Save