2 files changed, 16 insertions, 0 deletions
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 99ba8a43..7acd7259 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -62,6 +62,8 @@ var migrations = []Migration{
 	NewMigration("generate and migrate Git hooks", generateAndMigrateGitHooks),
 	// v15 -> v16:v0.10.16
 	NewMigration("update repository sizes", updateRepositorySizes),
+	// v16 -> v17:v0.10.31
+	NewMigration("remove invalid protect branch whitelist", removeInvalidProtectBranchWhitelist),
 }
 
 // Migrate database to current version
diff --git a/models/migrations/v17.go b/models/migrations/v17.go
new file mode 100644
index 00000000..6769b754
--- /dev/null
+++ b/models/migrations/v17.go
@@ -0,0 +1,14 @@
+// Copyright 2017 The Gogs 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 (
+	"github.com/go-xorm/xorm"
+)
+
+func removeInvalidProtectBranchWhitelist(x *xorm.Engine) error {
+	_, err := x.Exec("DELETE FROM protect_branch_whitelist WHERE protect_branch_id = 0")
+	return err
+}