diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala index 824860e..045adab 100644 --- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala @@ -490,6 +490,7 @@ * Displays branches. */ get("/:owner/:repository/branches")(referrersOnly { repository => + val protectedBranches = getProtectedBranchList(repository.owner, repository.name).toSet val branches = JGitUtil.getBranches( owner = repository.owner, name = repository.name, @@ -497,7 +498,7 @@ origin = repository.repository.originUserName.isEmpty ) .sortBy(br => (br.mergeInfo.isEmpty, br.commitTime)) - .map(br => br -> getPullRequestByRequestCommit(repository.owner, repository.name, repository.repository.defaultBranch, br.name, br.commitId)) + .map(br => (br, getPullRequestByRequestCommit(repository.owner, repository.name, repository.repository.defaultBranch, br.name, br.commitId), protectedBranches.contains(br.name))) .reverse html.branches(branches, hasWritePermission(repository.owner, repository.name, context.loginAccount), repository) diff --git a/src/main/twirl/gitbucket/core/repo/branches.scala.html b/src/main/twirl/gitbucket/core/repo/branches.scala.html index a726088..a6ca10d 100644 --- a/src/main/twirl/gitbucket/core/repo/branches.scala.html +++ b/src/main/twirl/gitbucket/core/repo/branches.scala.html @@ -1,4 +1,4 @@ -@(branchInfo: Seq[(gitbucket.core.util.JGitUtil.BranchInfo, Option[(gitbucket.core.model.PullRequest, gitbucket.core.model.Issue)])], +@(branchInfo: Seq[(gitbucket.core.util.JGitUtil.BranchInfo, Option[(gitbucket.core.model.PullRequest, gitbucket.core.model.Issue)], Boolean)], hasWritePermission: Boolean, repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context) @import context._ @@ -13,7 +13,7 @@
- @branchInfo.map { case (branch, prs) => + @branchInfo.map { case (branch, prs, isProtected) =>