diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2020-03-21 11:41:33 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 23:41:33 -0400 |
| commit | dcaa5643d70cd1be72e53e82a30d2bc6e5f8de92 (patch) | |
| tree | 55d98b7f1f8a24bf03d2be24b4c95f5e42e3b94b /routers/api | |
| parent | b3f4f812d818a860203d24dbf3f666a9557e0b7b (diff) | |
| download | gitea-dcaa5643d70cd1be72e53e82a30d2bc6e5f8de92.tar.gz gitea-dcaa5643d70cd1be72e53e82a30d2bc6e5f8de92.zip | |
Fix branch api canPush and canMerge (#10776)
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'routers/api')
| -rw-r--r-- | routers/api/v1/repo/branch.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index fccfc2bfe1..0d4501cd79 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -72,7 +72,13 @@ func GetBranch(ctx *context.APIContext) { return } - ctx.JSON(http.StatusOK, convert.ToBranch(ctx.Repo.Repository, branch, c, branchProtection, ctx.User, ctx.Repo.IsAdmin())) + br, err := convert.ToBranch(ctx.Repo.Repository, branch, c, branchProtection, ctx.User, ctx.Repo.IsAdmin()) + if err != nil { + ctx.Error(http.StatusInternalServerError, "convert.ToBranch", err) + return + } + + ctx.JSON(http.StatusOK, br) } // ListBranches list all the branches of a repository @@ -115,7 +121,11 @@ 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, ctx.Repo.IsAdmin()) + apiBranches[i], err = convert.ToBranch(ctx.Repo.Repository, branches[i], c, branchProtection, ctx.User, ctx.Repo.IsAdmin()) + if err != nil { + ctx.Error(http.StatusInternalServerError, "convert.ToBranch", err) + return + } } ctx.JSON(http.StatusOK, &apiBranches) |