merge upstream & fix conflicts

models/migrations/migrations.go

@@ -293,6 +293,8 @@ var migrations = []Migration{
 	// v118 -> v119
 	NewMigration("Add commit id and stale to reviews", addReviewCommitAndStale),
 	// v119 -> v120
+	NewMigration("Fix migrated repositories' git service type", fixMigratedRepositoryServiceType),
+	// v120 -> v121
 	NewMigration("add is_restricted column for users table", addIsRestricted),
 }
 

models/migrations/v119.go

@@ -4,14 +4,13 @@
 
 package migrations
 
-import "xorm.io/xorm"
+import (
+	"code.gitea.io/gitea/modules/structs"
 
-func addIsRestricted(x *xorm.Engine) error {
-	// User see models/user.go
-	type User struct {
-		ID           int64 `xorm:"pk autoincr"`
-		IsRestricted bool  `xorm:"NOT NULL DEFAULT false"`
-	}
+	"xorm.io/xorm"
+)
 
-	return x.Sync2(new(User))
+func fixMigratedRepositoryServiceType(x *xorm.Engine) error {
+	_, err := x.Exec("UPDATE repository SET original_service_type = ? WHERE original_url LIKE 'https://github.com/%'", structs.GithubService)
+	return err
 }

models/migrations/v120.go

@@ -0,0 +1,17 @@
+// Copyright 2020 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 addIsRestricted(x *xorm.Engine) error {
+	// User see models/user.go
+	type User struct {
+		ID           int64 `xorm:"pk autoincr"`
+		IsRestricted bool  `xorm:"NOT NULL DEFAULT false"`
+	}
+
+	return x.Sync2(new(User))
+}