diff --git a/src/main/twirl/gitbucket/core/repo/branches.scala.html b/src/main/twirl/gitbucket/core/repo/branches.scala.html
index 94007c9..2019f07 100644
--- a/src/main/twirl/gitbucket/core/repo/branches.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/branches.scala.html
@@ -46,7 +46,7 @@
- @if(repository.repository.defaultBranch != branch.name){
+ @if(repository.repository.defaultBranch != branch.name || repository.repository.originUserName.isDefined){
@branch.mergeInfo.map{ info =>
@prs.map{ case (pull, issue) =>
#@issue.issueId
@@ -76,13 +76,14 @@
}
@if(hasWritePermission){
- @if(prs.map(!_._2.closed).getOrElse(false)){
+ @if(prs.exists(!_._2.closed)){
} else {
- @if(isProtected){
+ @if(isProtected || repository.repository.defaultBranch == branch.name) {
} else {
-
+
}
}
@@ -99,7 +100,7 @@
|