|
|
@ -162,6 +162,12 @@ func loadBranches(ctx *context.Context) []*Branch { |
|
|
|
return nil |
|
|
|
return nil |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
protectedBranches, err := ctx.Repo.Repository.GetProtectedBranches() |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
|
|
|
|
ctx.ServerError("GetProtectedBranches", err) |
|
|
|
|
|
|
|
return nil |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
branches := make([]*Branch, len(rawBranches)) |
|
|
|
branches := make([]*Branch, len(rawBranches)) |
|
|
|
for i := range rawBranches { |
|
|
|
for i := range rawBranches { |
|
|
|
commit, err := rawBranches[i].GetCommit() |
|
|
|
commit, err := rawBranches[i].GetCommit() |
|
|
@ -170,11 +176,13 @@ func loadBranches(ctx *context.Context) []*Branch { |
|
|
|
return nil |
|
|
|
return nil |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var isProtected bool |
|
|
|
branchName := rawBranches[i].Name |
|
|
|
branchName := rawBranches[i].Name |
|
|
|
isProtected, err := ctx.Repo.Repository.IsProtectedBranch(branchName, ctx.User) |
|
|
|
for _, b := range protectedBranches { |
|
|
|
if err != nil { |
|
|
|
if b.BranchName == branchName { |
|
|
|
ctx.ServerError("IsProtectedBranch", err) |
|
|
|
isProtected = true |
|
|
|
return nil |
|
|
|
break |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
divergence, divergenceError := repofiles.CountDivergingCommits(ctx.Repo.Repository, branchName) |
|
|
|
divergence, divergenceError := repofiles.CountDivergingCommits(ctx.Repo.Repository, branchName) |
|
|
|