From 49481caf6db89b0853626ac52ab5f786a6887179 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 4 May 2017 15:45:19 -0400 Subject: PLT-6262 Add config setting to disable file attachments (#6301) * Add config setting to disable file attachments * Add unit tests * Updating UI for no attachments (#6312) * Update UI text on file upload System Console setting (#6313) * Update storage_settings.jsx * Update en.json --- webapp/actions/websocket_actions.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'webapp/actions/websocket_actions.jsx') diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx index c6de42647..4d2b5a2b5 100644 --- a/webapp/actions/websocket_actions.jsx +++ b/webapp/actions/websocket_actions.jsx @@ -35,6 +35,7 @@ import store from 'stores/redux_store.jsx'; const dispatch = store.dispatch; const getState = store.getState; import {viewChannel, getChannelAndMyMember, getChannelStats} from 'mattermost-redux/actions/channels'; +import {setServerVersion} from 'mattermost-redux/actions/general'; import {ChannelTypes} from 'mattermost-redux/action_types'; const MAX_WEBSOCKET_FAILS = 7; @@ -390,7 +391,7 @@ function handleStatusChangedEvent(msg) { function handleHelloEvent(msg) { Client.serverVersion = msg.data.server_version; - AsyncClient.checkVersion(); + setServerVersion(msg.data.server_version)(dispatch, getState); } function handleWebrtc(msg) { -- cgit v1.2.3-1-g7c22