Merge branch 'main' into develop

zeripath · web-flow · commit 9c092f6ad6cf · 2021-07-13T20:54:10.000+01:00
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
@@ -620,7 +620,13 @@ func Edit(ctx *context.APIContext) {
 		}
 	}
 
-	ctx.JSON(http.StatusOK, convert.ToRepo(ctx.Repo.Repository, ctx.Repo.AccessMode))
+	repo, err := models.GetRepositoryByID(ctx.Repo.Repository.ID)
+	if err != nil {
+		ctx.InternalServerError(err)
+		return
+	}
+
+	ctx.JSON(http.StatusOK, convert.ToRepo(repo, ctx.Repo.AccessMode))
 }
 
 // updateBasicProperties updates the basic properties of a repo: Name, Description, Website and Visibility

Original file line number	Diff line number	Diff line change
`@@ -620,7 +620,13 @@ func Edit(ctx *context.APIContext) {`
`620`	`620`	`}`
`621`	`621`	`}`
`622`	`622`
`623`		`- ctx.JSON(http.StatusOK, convert.ToRepo(ctx.Repo.Repository, ctx.Repo.AccessMode))`
	`623`	`+ repo, err := models.GetRepositoryByID(ctx.Repo.Repository.ID)`
	`624`	`+ if err != nil {`
	`625`	`+ ctx.InternalServerError(err)`
	`626`	`+ return`
	`627`	`+ }`
	`628`	`+`
	`629`	`+ ctx.JSON(http.StatusOK, convert.ToRepo(repo, ctx.Repo.AccessMode))`
`624`	`630`	`}`
`625`	`631`
`626`	`632`	`// updateBasicProperties updates the basic properties of a repo: Name, Description, Website and Visibility`