cerc-io/gitea
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve branches list performance and fix protected branch icon when no-login (#7695)

Browse Source
This commit is contained in:
Lunny Xiao 2019-08-01 22:50:06 +08:00 committed by techknowlogick
parent a4b7a4f2f8
commit 02999c9a44
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
routers/repo/branch.go
View File

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