tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-08-26 03:18:28 +00:00
Code Releases Activity

Fix bug on branch API (#10767) (#10775)

Browse Source 
* Fix bug on branch API (#10767)

* Fix branch api canPush and canMerge
This commit is contained in:
Lunny Xiao
2020-03-21 05:31:01 +08:00
committed by GitHub
parent e2da9cd21f
commit 602fe45936
4 changed files with 60 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
routers/api/v1/repo/branch.go
View File

@@ -70,7 +70,13 @@ func GetBranch(ctx *context.APIContext) {
return
}
ctx.JSON(http.StatusOK, convert.ToBranch(ctx.Repo.Repository, branch, c, branchProtection, ctx.User))
br, err := convert.ToBranch(ctx.Repo.Repository, branch, c, branchProtection, ctx.User)
if err != nil {
ctx.Error(http.StatusInternalServerError, "convert.ToBranch", err)
return
}
ctx.JSON(http.StatusOK, br)
}
// ListBranches list all the branches of a repository
@@ -113,7 +119,14 @@ func ListBranches(ctx *context.APIContext) {
ctx.Error(http.StatusInternalServerError, "GetBranchProtection", err)
return
}
apiBranches[i] = convert.ToBranch(ctx.Repo.Repository, branches[i], c, branchProtection, ctx.User)
br, err := convert.ToBranch(ctx.Repo.Repository, branches[i], c, branchProtection, ctx.User)
if err != nil {
ctx.Error(http.StatusInternalServerError, "convert.ToBranch", err)
return
}
apiBranches[i] = br
}
ctx.JSON(http.StatusOK, &apiBranches)