pre 4.2 cut (#7380)

model/version.go

@@ -13,6 +13,7 @@ import (
 // It should be maitained in chronological order with most current
 // release at the front of the list.
 var versions = []string{
+	"4.2.0",
 	"4.1.0",
 	"4.0.0",
 	"3.10.0",

store/sql_upgrade.go

@@ -296,8 +296,7 @@ func UpgradeDatabaseToVersion41(sqlStore SqlStore) {
 }
 
 func UpgradeDatabaseToVersion42(sqlStore SqlStore) {
-	// TODO: Uncomment following condition when version 4.1.0 is released
+	if shouldPerformUpgrade(sqlStore, VERSION_4_1_0, VERSION_4_2_0) {
-	// if shouldPerformUpgrade(sqlStore, VERSION_4_1_0, VERSION_4_2_0) {
+		saveSchemaVersion(sqlStore, VERSION_4_2_0)
-	// 	saveSchemaVersion(sqlStore, VERSION_4_2_0)
+	}
-	// }
 }