diff --git a/src/main/twirl/gitbucket/core/repo/branches.scala.html b/src/main/twirl/gitbucket/core/repo/branches.scala.html index a9318d4..3dcd2db 100644 --- a/src/main/twirl/gitbucket/core/repo/branches.scala.html +++ b/src/main/twirl/gitbucket/core/repo/branches.scala.html @@ -23,7 +23,7 @@ - @if(branch.mergeInfo.isEmpty){ + @if(repository.repository.defaultBranch == branch.name){ Default } else { @branch.mergeInfo.map{ info => @@ -38,47 +38,49 @@
- @branch.mergeInfo.map{ info => - @prs.map{ case (pull, issue) => - #@issue.issueId - @if(issue.closed) { - @if(info.isMerged){ - Merged - } else { - Closed + @if(repository.repository.defaultBranch != branch.name){ + @branch.mergeInfo.map{ info => + @prs.map{ case (pull, issue) => + #@issue.issueId + @if(issue.closed) { + @if(info.isMerged){ + Merged + } else { + Closed + } + } else { + Open + } + }.getOrElse{ + @if(context.loginAccount.isDefined){ + New Pull request + } else { + Compare + } } - } else { - Open - } - }.getOrElse{ - @if(context.loginAccount.isDefined){ - New Pull request - } else { - Compare - } - } - @if(hasWritePermission){ - - @if(prs.map(!_._2.closed).getOrElse(false)){ - - } else { - @if(isProtected){ - - } else { - + @if(hasWritePermission){ + + @if(prs.map(!_._2.closed).getOrElse(false)){ + + } else { + @if(isProtected){ + + } else { + + } + } + } } - } - }