Merge pull request #1661 from mattermost/plt-1425

PLT-1425 Remove @all from recent mentions

web/react/components/channel_header.jsx

@@ -101,9 +101,9 @@ export default class ChannelHeader extends React.Component {
         if (user.notify_props && user.notify_props.mention_keys) {
             const termKeys = UserStore.getCurrentMentionKeys();
 
-            // if (user.notify_props.all === 'true' && termKeys.indexOf('@all') !== -1) {
+            if (user.notify_props.all === 'true' && termKeys.indexOf('@all') !== -1) {
-            //     termKeys.splice(termKeys.indexOf('@all'), 1);
+                termKeys.splice(termKeys.indexOf('@all'), 1);
-            // }
+            }
 
             if (user.notify_props.channel === 'true' && termKeys.indexOf('@channel') !== -1) {
                 termKeys.splice(termKeys.indexOf('@channel'), 1);