summaryrefslogtreecommitdiffstats
path: root/webapp/components
diff options
context:
space:
mode:
authorDavid Meza <dmeza@users.noreply.github.com>2017-05-30 11:02:44 -0500
committerHarrison Healey <harrisonmhealey@gmail.com>2017-05-30 12:02:44 -0400
commiteab6f7459478d23968466766cbe49185d405a056 (patch)
tree3323cfd3c2592177fa9ce6c856cc12283a4e9cf3 /webapp/components
parent23ca4fe69cb4baf0c38666b917eb8307949d8b5b (diff)
downloadchat-eab6f7459478d23968466766cbe49185d405a056.tar.gz
chat-eab6f7459478d23968466766cbe49185d405a056.tar.bz2
chat-eab6f7459478d23968466766cbe49185d405a056.zip
PLT-6485 Add ability to disable `@here` notifications (#6372)
Diffstat (limited to 'webapp/components')
-rw-r--r--webapp/components/user_settings/user_settings_notifications.jsx3
1 files changed, 2 insertions, 1 deletions
diff --git a/webapp/components/user_settings/user_settings_notifications.jsx b/webapp/components/user_settings/user_settings_notifications.jsx
index b0b4855b2..6cfceb444 100644
--- a/webapp/components/user_settings/user_settings_notifications.jsx
+++ b/webapp/components/user_settings/user_settings_notifications.jsx
@@ -589,7 +589,7 @@ export default class NotificationsTab extends React.Component {
/>
<FormattedMessage
id='user.settings.notifications.channelWide'
- defaultMessage='Channel-wide mentions "@channel", "@all"'
+ defaultMessage='Channel-wide mentions "@channel", "@all", "@here"'
/>
</label>
</div>
@@ -658,6 +658,7 @@ export default class NotificationsTab extends React.Component {
if (this.state.channelKey) {
keys.push('@channel');
keys.push('@all');
+ keys.push('@here');
}
if (this.state.customKeys.length > 0) {
keys = keys.concat(this.state.customKeys.split(','));