From e3f01f15bd93a4dd436e8b9843451b518b2dd04a Mon Sep 17 00:00:00 2001 From: Marcin Sedlak-Jakubowski Date: Mon, 7 Apr 2025 21:27:05 +0200 Subject: [PATCH] Clarify that "Watch" doesn't include all notifications Changelog: other --- .../javascripts/notifications/constants.js | 2 +- doc/user/profile/notifications.md | 33 ++++++++++++++----- locale/gitlab.pot | 2 +- .../components/notifications_dropdown_spec.js | 2 +- 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/notifications/constants.js b/app/assets/javascripts/notifications/constants.js index c2aeee2751a06e..3697e5c1042c26 100644 --- a/app/assets/javascripts/notifications/constants.js +++ b/app/assets/javascripts/notifications/constants.js @@ -15,7 +15,7 @@ export const i18n = { notificationDescriptions: { participating: __('You will only receive notifications for items you have participated in'), mention: __('You will receive notifications only for comments in which you were @mentioned'), - watch: __('You will receive notifications for any activity'), + watch: __('You will receive notifications for most activity'), disabled: __('You will not get any notifications via email'), global: __('Use your global notification setting'), custom: __( diff --git a/doc/user/profile/notifications.md b/doc/user/profile/notifications.md index 718952d8d53068..43c181d53a171e 100644 --- a/doc/user/profile/notifications.md +++ b/doc/user/profile/notifications.md @@ -84,14 +84,14 @@ Notification scope is applied from the broadest to most specific levels: For each project and group you can select one of the following levels: -| Level | Description | -| ----------- | ----------------------------------------------------------- | -| Global | Your global settings apply. | -| Watch | Receive notifications for any activity. | +| Level | Description | +| ----------- | ----------- | +| Global | Your global settings apply. | +| Watch | Receive notifications for [most activity](#events-not-included-in-the-watch-level). | | Participate | Receive notifications for threads you have participated in. | | On mention | Receive notifications when you are [mentioned](../discussions/_index.md#mentions) in a comment. | -| Disabled | Receive no notifications. | -| Custom | Receive notifications for selected events and threads you have participated in. | +| Disabled | Receive no notifications. | +| Custom | Receive notifications for selected events and threads you have participated in. | ### Global notification settings @@ -207,13 +207,28 @@ In issues, merge requests, and epics, for most events, the notification is sent - Anyone [mentioned](../discussions/_index.md#mentions) by username in the title or description. - Anyone mentioned by username in a comment if their notification level is "Participating" or higher. -- Watchers: users with notification level "Watch". +- Watchers: users with notification level "Watch" ([with some exceptions](#events-not-included-in-the-watch-level)). - Subscribers: anyone who manually subscribed to notifications. - Custom: users with notification level "Custom" who turned on notifications for a fitting type of events. To minimize the number of notifications that do not require any action, eligible -approvers are not notified for all the activities in their projects. To turn on such notifications, they have -to change their user notification settings to **Watch** instead. +approvers are not notified for all the activities in their projects. + +To get notified about all events, change your user notification settings to **Custom** and select +all the options. + +#### Events not included in the Watch level + +If you set the notification level to **Watch**, you get notified about _almost all_ events, with +these exceptions: + +- Somebody pushes to a merge request. +- Issue is due the next day. +- Pipeline succeeds. +- Merge request that you're eligible to approve is created. + +Issue [501083](https://gitlab.com/gitlab-org/gitlab/-/issues/501083) tracks adding these events to +the **Watch** level. ### Edit notification settings for issues, merge requests, and epics diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 7c215f53cec7e6..9557c38a357139 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -69353,7 +69353,7 @@ msgstr "" msgid "You will only receive notifications for items you have participated in and the events you choose" msgstr "" -msgid "You will receive notifications for any activity" +msgid "You will receive notifications for most activity" msgstr "" msgid "You will receive notifications only for comments in which you were @mentioned" diff --git a/spec/frontend/notifications/components/notifications_dropdown_spec.js b/spec/frontend/notifications/components/notifications_dropdown_spec.js index 30eb569da4d606..d17e3dd9cb24f7 100644 --- a/spec/frontend/notifications/components/notifications_dropdown_spec.js +++ b/spec/frontend/notifications/components/notifications_dropdown_spec.js @@ -181,7 +181,7 @@ describe('NotificationsDropdown', () => { it.each` dropdownIndex | level | title | description ${0} | ${'global'} | ${'Global'} | ${'Use your global notification setting'} - ${1} | ${'watch'} | ${'Watch'} | ${'You will receive notifications for any activity'} + ${1} | ${'watch'} | ${'Watch'} | ${'You will receive notifications for most activity'} ${2} | ${'participating'} | ${'Participate'} | ${'You will only receive notifications for items you have participated in'} ${3} | ${'mention'} | ${'On mention'} | ${'You will receive notifications only for comments in which you were @mentioned'} ${4} | ${'disabled'} | ${'Disabled'} | ${'You will not get any notifications via email'} -- GitLab