diff --git a/src/main/resources/update/3_10.sql b/src/main/resources/update/3_11.sql similarity index 100% rename from src/main/resources/update/3_10.sql rename to src/main/resources/update/3_11.sql diff --git a/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala b/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala index c8987fb38..6a284ee3c 100644 --- a/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala +++ b/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala @@ -21,6 +21,7 @@ object AutoUpdate { * The history of versions. A head of this sequence is the current BitBucket version. */ val versions = Seq( + new Version(3, 11), new Version(3, 10), new Version(3, 9), new Version(3, 8), diff --git a/src/main/twirl/gitbucket/core/settings/branches.scala.html b/src/main/twirl/gitbucket/core/settings/branches.scala.html index 8a731b0d6..eb4df5157 100644 --- a/src/main/twirl/gitbucket/core/settings/branches.scala.html +++ b/src/main/twirl/gitbucket/core/settings/branches.scala.html @@ -18,7 +18,7 @@ }else{ @helper.html.information(info)
-
Default branch
+
Default branch

The default branch is considered the “base” branch in your repository, against which all pull requests and code commits are automatically made, unless you specify a different branch.

@@ -34,7 +34,7 @@
-
Protected branches
+
Protected branches

Protect branches to disable force pushing, prevent branches from being deleted, and optionally require status checks before merging. New to protected branches? diff --git a/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html b/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html index ae501112e..853b575f4 100644 --- a/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html +++ b/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html @@ -11,24 +11,34 @@ @html.menu("settings", repository){ @menu("branches", repository){ @helper.html.information(info) -

-
+ + +
Branch protection for @branch
- +

Disables force-pushes to this branch and prevents it from being deleted.

-
+
+ } } }