Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2

app/channel.go

@@ -386,6 +386,12 @@ func (a *App) UpdateChannelPrivacy(oldChannel *model.Channel, user *model.User)
 			return channel, err
 		}
 
+		a.InvalidateCacheForChannel(channel)
+
+		messageWs := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_CHANNEL_CONVERTED, channel.TeamId, "", "", nil)
+		messageWs.Add("channel_id", channel.Id)
+		a.Publish(messageWs)
+
 		return channel, nil
 	}
 }