Merge branch 'feature' into develop
This commit is contained in:
commit
4b8ba4576e
|
|
@ -58,13 +58,13 @@ func ListBranches(ctx *context.APIContext) {
|
||||||
ctx.Error(http.StatusInternalServerError, "CountBranches", err)
|
ctx.Error(http.StatusInternalServerError, "CountBranches", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// if totalNumOfBranches == 0 { // sync branches immediately because non-empty repository should have at least 1 branch
|
if totalNumOfBranches == 0 { // sync branches immediately because non-empty repository should have at least 1 branch
|
||||||
// totalNumOfBranches, err = repo_module.SyncRepoBranches(ctx, ctx.Repo.Repository.ID, 0)
|
_, err = repo_module.SyncRepoBranches(ctx, ctx.Repo.Repository.ID, 0)
|
||||||
// if err != nil {
|
if err != nil {
|
||||||
// ctx.ServerError("SyncRepoBranches", err)
|
ctx.ServerError("SyncRepoBranches", err)
|
||||||
// return
|
return
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
|
|
||||||
rules, err := git_model.FindRepoProtectedBranchRules(ctx, ctx.Repo.Repository.ID)
|
rules, err := git_model.FindRepoProtectedBranchRules(ctx, ctx.Repo.Repository.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue