summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauris BH <lauris@nix.lv>2017-09-20 17:52:23 +0300
committerGitHub <noreply@github.com>2017-09-20 17:52:23 +0300
commit6718ea6ff152155e4affc2493cfd0c634e3e228d (patch)
tree72c1e6b38e3a96e731fa3f3655afe5b8c93ccf62
parent6f380a22a400911a241499ba9fbfca914bbae248 (diff)
downloadgitea-6718ea6ff152155e4affc2493cfd0c634e3e228d.tar.gz
gitea-6718ea6ff152155e4affc2493cfd0c634e3e228d.zip
Fix can_push value to false in protected_branch (#2560)
-rw-r--r--models/branches.go1
-rw-r--r--models/migrations/migrations.go2
-rw-r--r--models/migrations/v43.go18
3 files changed, 21 insertions, 0 deletions
diff --git a/models/branches.go b/models/branches.go
index 1c3c0d17be..c26ee7d890 100644
--- a/models/branches.go
+++ b/models/branches.go
@@ -26,6 +26,7 @@ type ProtectedBranch struct {
ID int64 `xorm:"pk autoincr"`
RepoID int64 `xorm:"UNIQUE(s)"`
BranchName string `xorm:"UNIQUE(s)"`
+ CanPush bool `xorm:"NOT NULL DEFAULT false"`
EnableWhitelist bool
WhitelistUserIDs []int64 `xorm:"JSON TEXT"`
WhitelistTeamIDs []int64 `xorm:"JSON TEXT"`
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index d302b2c075..95b8e0774f 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -134,6 +134,8 @@ var migrations = []Migration{
NewMigration("add default value to user prohibit_login", addDefaultValueToUserProhibitLogin),
// v42 -> v43
NewMigration("add tags to releases and sync existing repositories", releaseAddColumnIsTagAndSyncTags),
+ // v43 -> v44
+ NewMigration("fix protected branch can push value to false", fixProtectedBranchCanPushValue),
}
// Migrate database to current version
diff --git a/models/migrations/v43.go b/models/migrations/v43.go
new file mode 100644
index 0000000000..b6351fa831
--- /dev/null
+++ b/models/migrations/v43.go
@@ -0,0 +1,18 @@
+// Copyright 2017 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package migrations
+
+import (
+ "code.gitea.io/gitea/models"
+
+ "github.com/go-xorm/xorm"
+)
+
+func fixProtectedBranchCanPushValue(x *xorm.Engine) error {
+ _, err := x.Cols("can_push").Update(&models.ProtectedBranch{
+ CanPush: false,
+ })
+ return err
+}