Merge branch 'V20220601' into fix-2054

routers/repo/setting.go

@@ -484,7 +484,9 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
 			return
 		} else {
 			if count >= 1 {
-				ctx.RenderWithErr(ctx.Tr("repo.settings.deletion_notice_cloudbrain"), tplSettingsOptions, nil)
+				ctx.Data["Err_RepoName"] = nil
+				ctx.Flash.Error(ctx.Tr("repo.settings.deletion_notice_cloudbrain"))
+				ctx.Redirect(ctx.Repo.RepoLink + "/settings")
 				return
 			}
 			if err := repo_service.DeleteRepository(ctx.User, ctx.Repo.Repository); err != nil {