Merge pull request #1502 from mattermost/disable-all

Disabling the all mention

1 files changed, 6 insertions, 4 deletions

diff --git a/web/react/components/user_settings/user_settings_notifications.jsx b/web/react/components/user_settings/user_settings_notifications.jsx
index e36aed395..e025bf670 100644
--- a/web/react/components/user_settings/user_settings_notifications.jsx
+++ b/web/react/components/user_settings/user_settings_notifications.jsx
@@ -512,7 +512,7 @@ export default class NotificationsTab extends React.Component {
             }.bind(this);
             inputs.push(
                 <div key='userNotificationAllOption'>
-                    <div className='checkbox'>
+                    <div className='checkbox hidden'>
                         <label>
                             <input
                                 type='checkbox'
@@ -590,9 +590,11 @@ export default class NotificationsTab extends React.Component {
             if (this.state.mentionKey) {
                 keys.push('@' + user.username);
             }
-            if (this.state.allKey) {
-                keys.push('@all');
-            }
+
+            // if (this.state.allKey) {
+            //     keys.push('@all');
+            // }
+
             if (this.state.channelKey) {
                 keys.push('@channel');
             }