Merge branch 'master' into fix-8472-add-option-for-whitelist-deploy-key

models/migrations/migrations.go

@@ -257,6 +257,10 @@ var migrations = []Migration{
 	// v100 -> v101
 	NewMigration("update migration repositories' service type", updateMigrationServiceTypes),
 	// v101 -> v102
+	NewMigration("change length of some external login users columns", changeSomeColumnsLengthOfExternalLoginUser),
+	// v102 -> v103
+	NewMigration("update migration repositories' service type", dropColumnHeadUserNameOnPullRequest),
+	// v103 -> v104
 	NewMigration("Add WhitelistDeployKeys to protected branch", addWhitelistDeployKeysToBranches),
 }
 

models/migrations/v101.go

@@ -4,13 +4,16 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import (
+	"xorm.io/xorm"
+)
 
-func addWhitelistDeployKeysToBranches(x *xorm.Engine) error {
-	type ProtectedBranch struct {
-		ID                  int64
-		WhitelistDeployKeys bool `xorm:"NOT NULL DEFAULT false"`
+func changeSomeColumnsLengthOfExternalLoginUser(x *xorm.Engine) error {
+	type ExternalLoginUser struct {
+		AccessToken       string `xorm:"TEXT"`
+		AccessTokenSecret string `xorm:"TEXT"`
+		RefreshToken      string `xorm:"TEXT"`
 	}
 
-	return x.Sync2(new(ProtectedBranch))
+	return x.Sync2(new(ExternalLoginUser))
 }

models/migrations/v103.go

@@ -0,0 +1,18 @@
+// Copyright 2019 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 (
+	"xorm.io/xorm"
+)
+
+func addWhitelistDeployKeysToBranches(x *xorm.Engine) error {
+	type ProtectedBranch struct {
+		ID                  int64
+		WhitelistDeployKeys bool `xorm:"NOT NULL DEFAULT false"`
+	}
+
+	return x.Sync2(new(ProtectedBranch))
+}