Merge branch 'release-4.7'

store/sqlstore/upgrade.go

@@ -345,6 +345,7 @@ func UpgradeDatabaseToVersion46(sqlStore SqlStore) {
 func UpgradeDatabaseToVersion47(sqlStore SqlStore) {
 	if shouldPerformUpgrade(sqlStore, VERSION_4_6_0, VERSION_4_7_0) {
 		sqlStore.AlterColumnTypeIfExists("Users", "Position", "varchar(128)", "varchar(128)")
+		sqlStore.AlterColumnTypeIfExists("OAuthAuthData", "State", "varchar(1024)", "varchar(1024)")
 		saveSchemaVersion(sqlStore, VERSION_4_7_0)
 	}
 }