Unverified Commit 1e1a5e5e authored by JoramWilander's avatar JoramWilander

Merge branch 'master' into plugins-2

parents 6daf8207 9470564d
......@@ -565,6 +565,7 @@ var restrictedUsernames = []string{
"all",
"channel",
"matterbot",
"system",
}
func IsValidUsername(s string) bool {
......
......@@ -272,6 +272,7 @@ var usernames = []struct {
{"spin'punch", false},
{"spin*punch", false},
{"all", false},
{"system", false},
}
func TestValidUsername(t *testing.T) {
......
......@@ -15,6 +15,7 @@ import (
)
const (
VERSION_5_2_0 = "5.2.0"
VERSION_5_1_0 = "5.1.0"
VERSION_5_0_0 = "5.0.0"
VERSION_4_10_0 = "4.10.0"
......@@ -80,6 +81,7 @@ func UpgradeDatabase(sqlStore SqlStore) {
UpgradeDatabaseToVersion410(sqlStore)
UpgradeDatabaseToVersion50(sqlStore)
UpgradeDatabaseToVersion51(sqlStore)
UpgradeDatabaseToVersion52(sqlStore)
// If the SchemaVersion is empty this this is the first time it has ran
// so lets set it to the current version.
......@@ -470,3 +472,11 @@ func UpgradeDatabaseToVersion51(sqlStore SqlStore) {
saveSchemaVersion(sqlStore, VERSION_5_1_0)
}
}
func UpgradeDatabaseToVersion52(sqlStore SqlStore) {
// TODO: Uncomment following condition when version 5.2.0 is released
// if shouldPerformUpgrade(sqlStore, VERSION_5_1_0, VERSION_5_2_0) {
// saveSchemaVersion(sqlStore, VERSION_5_2_0)
// }
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment