Merge branch 'master' into plugins-2

3 files changed, 12 insertions, 0 deletions

diff --git a/model/user.go b/model/user.go
index c5d6c13b6..e56f3aaed 100644
--- a/model/user.go
+++ b/model/user.go
@@ -565,6 +565,7 @@ var restrictedUsernames = []string{
 	"all",
 	"channel",
 	"matterbot",
+	"system",
 }
 
 func IsValidUsername(s string) bool {
diff --git a/model/user_test.go b/model/user_test.go
index 645eaadff..a1953a40d 100644
--- a/model/user_test.go
+++ b/model/user_test.go
@@ -272,6 +272,7 @@ var usernames = []struct {
 	{"spin'punch", false},
 	{"spin*punch", false},
 	{"all", false},
+	{"system", false},
 }
 
 func TestValidUsername(t *testing.T) {
diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go
index 868575522..8ea44371c 100644
--- a/store/sqlstore/upgrade.go
+++ b/store/sqlstore/upgrade.go
@@ -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)
+	// }
+}