summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2017-09-05 19:29:26 -0500
committerGitHub <noreply@github.com>2017-09-05 19:29:26 -0500
commit90da40b54c5f7b36a3936bee2901fc645cc8ef4c (patch)
tree22f4681c9891077851012e9607c6c5b479f5fec7
parent1605fa5102e7d5d76a02456130097d3ab82c2a2b (diff)
downloadchat-90da40b54c5f7b36a3936bee2901fc645cc8ef4c.tar.gz
chat-90da40b54c5f7b36a3936bee2901fc645cc8ef4c.tar.bz2
chat-90da40b54c5f7b36a3936bee2901fc645cc8ef4c.zip
pre 4.2 cut (#7380)
-rw-r--r--model/version.go1
-rw-r--r--store/sql_upgrade.go7
2 files changed, 4 insertions, 4 deletions
diff --git a/model/version.go b/model/version.go
index b08af46bd..eaac69e74 100644
--- a/model/version.go
+++ b/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",
diff --git a/store/sql_upgrade.go b/store/sql_upgrade.go
index e10bdec13..7ec831a17 100644
--- a/store/sql_upgrade.go
+++ b/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) {
- // saveSchemaVersion(sqlStore, VERSION_4_2_0)
- // }
+ if shouldPerformUpgrade(sqlStore, VERSION_4_1_0, VERSION_4_2_0) {
+ saveSchemaVersion(sqlStore, VERSION_4_2_0)
+ }
}