Fix merge

lunny · lunny · commit 3042d1395c3b · 2020-12-02T22:00:33.000+08:00
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
@@ -256,6 +256,8 @@ var migrations = []Migration{
 	NewMigration("update reactions constraint", updateReactionConstraint),
 	// v160 -> v161
 	NewMigration("Add block on official review requests branch protection", addBlockOnOfficialReviewRequests),
+	// v161 -> v162
+	NewMigration("Convert task type from int to string", convertTaskTypeToString),
 }
 
 // GetCurrentDBVersion returns the current db version

Original file line number	Diff line number	Diff line change
`@@ -256,6 +256,8 @@ var migrations = []Migration{`
`256`	`256`	`NewMigration("update reactions constraint", updateReactionConstraint),`
`257`	`257`	`// v160 -> v161`
`258`	`258`	`NewMigration("Add block on official review requests branch protection", addBlockOnOfficialReviewRequests),`
	`259`	`+ // v161 -> v162`
	`260`	`+ NewMigration("Convert task type from int to string", convertTaskTypeToString),`
`259`	`261`	`}`
`260`	`262`
`261`	`263`	`// GetCurrentDBVersion returns the current db version`