diff --git a/src/main/resources/update/3_10.sql b/src/main/resources/update/3_10.sql deleted file mode 100644 index 721690a..0000000 --- a/src/main/resources/update/3_10.sql +++ /dev/null @@ -1,25 +0,0 @@ -DROP TABLE IF EXISTS PROTECTED_BRANCH; - -CREATE TABLE PROTECTED_BRANCH( - USER_NAME VARCHAR(100) NOT NULL, - REPOSITORY_NAME VARCHAR(100) NOT NULL, - BRANCH VARCHAR(100) NOT NULL, - STATUS_CHECK_ADMIN BOOLEAN NOT NULL DEFAULT false -); - -ALTER TABLE PROTECTED_BRANCH ADD CONSTRAINT IDX_PROTECTED_BRANCH_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, BRANCH); -ALTER TABLE PROTECTED_BRANCH ADD CONSTRAINT IDX_PROTECTED_BRANCH_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME) - ON DELETE CASCADE ON UPDATE CASCADE; - - -DROP TABLE IF EXISTS PROTECTED_BRANCH_REQUIRE_CONTEXT; -CREATE TABLE PROTECTED_BRANCH_REQUIRE_CONTEXT( - USER_NAME VARCHAR(100) NOT NULL, - REPOSITORY_NAME VARCHAR(100) NOT NULL, - BRANCH VARCHAR(100) NOT NULL, - CONTEXT VARCHAR(255) NOT NULL -); - -ALTER TABLE PROTECTED_BRANCH_REQUIRE_CONTEXT ADD CONSTRAINT IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, BRANCH, CONTEXT); -ALTER TABLE PROTECTED_BRANCH_REQUIRE_CONTEXT ADD CONSTRAINT IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME, BRANCH) REFERENCES PROTECTED_BRANCH (USER_NAME, REPOSITORY_NAME, BRANCH) - ON DELETE CASCADE ON UPDATE CASCADE; diff --git a/src/main/resources/update/3_11.sql b/src/main/resources/update/3_11.sql new file mode 100644 index 0000000..721690a --- /dev/null +++ b/src/main/resources/update/3_11.sql @@ -0,0 +1,25 @@ +DROP TABLE IF EXISTS PROTECTED_BRANCH; + +CREATE TABLE PROTECTED_BRANCH( + USER_NAME VARCHAR(100) NOT NULL, + REPOSITORY_NAME VARCHAR(100) NOT NULL, + BRANCH VARCHAR(100) NOT NULL, + STATUS_CHECK_ADMIN BOOLEAN NOT NULL DEFAULT false +); + +ALTER TABLE PROTECTED_BRANCH ADD CONSTRAINT IDX_PROTECTED_BRANCH_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, BRANCH); +ALTER TABLE PROTECTED_BRANCH ADD CONSTRAINT IDX_PROTECTED_BRANCH_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME) + ON DELETE CASCADE ON UPDATE CASCADE; + + +DROP TABLE IF EXISTS PROTECTED_BRANCH_REQUIRE_CONTEXT; +CREATE TABLE PROTECTED_BRANCH_REQUIRE_CONTEXT( + USER_NAME VARCHAR(100) NOT NULL, + REPOSITORY_NAME VARCHAR(100) NOT NULL, + BRANCH VARCHAR(100) NOT NULL, + CONTEXT VARCHAR(255) NOT NULL +); + +ALTER TABLE PROTECTED_BRANCH_REQUIRE_CONTEXT ADD CONSTRAINT IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, BRANCH, CONTEXT); +ALTER TABLE PROTECTED_BRANCH_REQUIRE_CONTEXT ADD CONSTRAINT IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME, BRANCH) REFERENCES PROTECTED_BRANCH (USER_NAME, REPOSITORY_NAME, BRANCH) + ON DELETE CASCADE ON UPDATE CASCADE; diff --git a/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala b/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala index c8987fb..6a284ee 100644 --- a/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala +++ b/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala @@ -21,6 +21,7 @@ * 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 8a731b0..eb4df51 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)
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.
Protect branches to disable force pushing, prevent branches from being deleted, and optionally require status checks before merging. New to protected branches?