From f3825ba766625806e0776a17146ca5fff372612e Mon Sep 17 00:00:00 2001
From: David Lu <david.lu@hotmail.com>
Date: Sat, 4 Jun 2016 11:21:50 -0700
Subject: PLT-2994 Added @all (#3233)

* Added @all

* Uncomment @all server side
---
 webapp/components/user_settings/user_settings_notifications.jsx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'webapp/components/user_settings/user_settings_notifications.jsx')

diff --git a/webapp/components/user_settings/user_settings_notifications.jsx b/webapp/components/user_settings/user_settings_notifications.jsx
index 6b07f59e2..be61e5fbc 100644
--- a/webapp/components/user_settings/user_settings_notifications.jsx
+++ b/webapp/components/user_settings/user_settings_notifications.jsx
@@ -842,7 +842,7 @@ class NotificationsTab extends React.Component {
                             />
                             <FormattedMessage
                                 id='user.settings.notifications.channelWide'
-                                defaultMessage='Channel-wide mentions "@channel"'
+                                defaultMessage='Channel-wide mentions "@channel", "@all"'
                             />
                         </label>
                     </div>
@@ -896,12 +896,9 @@ class NotificationsTab extends React.Component {
                 keys.push('@' + user.username);
             }
 
-            // if (this.state.allKey) {
-            //     keys.push('@all');
-            // }
-
             if (this.state.channelKey) {
                 keys.push('@channel');
+                keys.push('@all');
             }
             if (this.state.customKeys.length > 0) {
                 keys = keys.concat(this.state.customKeys.split(','));
-- 
cgit v1.2.3-1-g7c22