Merge remote-tracking branch 'upstream/release-5.3' into release-5.3-daily-merge-20180904

store/sqlstore/upgrade.go

@@ -484,10 +484,8 @@ func UpgradeDatabaseToVersion52(sqlStore SqlStore) {
 }
 
 func UpgradeDatabaseToVersion53(sqlStore SqlStore) {
-	// TODO: Uncomment following condition when version 5.3.0 is released
-	// if shouldPerformUpgrade(sqlStore, VERSION_5_2_0, VERSION_5_3_0) {
-	sqlStore.AlterColumnTypeIfExists("OutgoingWebhooks", "Description", "varchar(500)", "varchar(500)")
-	sqlStore.AlterColumnTypeIfExists("IncomingWebhooks", "Description", "varchar(500)", "varchar(500)")
-	// 	saveSchemaVersion(sqlStore, VERSION_5_3_0)
-	// }
+	if shouldPerformUpgrade(sqlStore, VERSION_5_2_0, VERSION_5_3_0) {
+		saveSchemaVersion(sqlStore, VERSION_5_3_0)
+	}
+
 }