From d15e49f7ffc6f91e7fa802be3ab06efb54fa7d69 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 1 Aug 2019 23:40:00 +0800 Subject: [PATCH] improve branches list performance and fix protected branch icon when no-login (#7695) (#7704) --- routers/repo/branch.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/routers/repo/branch.go b/routers/repo/branch.go index 3bd4a75bfb..5d78518491 100644 --- a/routers/repo/branch.go +++ b/routers/repo/branch.go @@ -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)