From 793959b086fb85e9f41feda7dd795ab5cb36624b Mon Sep 17 00:00:00 2001 From: Marcin Sedlak-Jakubowski Date: Mon, 7 Apr 2025 20:43:00 +0200 Subject: [PATCH 1/3] Clarify when "due soon" email is sent Also rename the custom setting from "Issue is due soon" to "Issue is due the next day". Changelog: other --- app/assets/javascripts/notifications/constants.js | 2 +- doc/user/profile/notifications.md | 3 ++- doc/user/project/issues/due_dates.md | 4 ++-- locale/gitlab.pot | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/notifications/constants.js b/app/assets/javascripts/notifications/constants.js index c2aeee2751a06e..f126e93fccba77 100644 --- a/app/assets/javascripts/notifications/constants.js +++ b/app/assets/javascripts/notifications/constants.js @@ -42,7 +42,7 @@ export const i18n = { close_merge_request: s__('NotificationEvent|Merge request is closed'), failed_pipeline: s__('NotificationEvent|Pipeline fails'), fixed_pipeline: s__('NotificationEvent|Pipeline is fixed'), - issue_due: s__('NotificationEvent|Issue is due soon'), + issue_due: s__('NotificationEvent|Issue is due the next day'), merge_merge_request: s__('NotificationEvent|Merge request is merged'), moved_project: s__('NotificationEvent|Project is moved'), new_epic: s__('NotificationEvent|Epic is created'), diff --git a/doc/user/profile/notifications.md b/doc/user/profile/notifications.md index 718952d8d53068..ea55aaa762bb04 100644 --- a/doc/user/profile/notifications.md +++ b/doc/user/profile/notifications.md @@ -261,7 +261,8 @@ epics: | Epic | New note | Participants, Watchers, Subscribers, and Custom notification level with this event selected. Also anyone mentioned by username in the comment, with notification level "Mention" or higher. | | Epic | Reopened | Subscribers and participants. | | Issue | Closed | Subscribers and participants. | -| Issue | Due | Participants and Custom notification level with this event selected. | + +| Issue | Due the next day. The notification is sent at 00:50 UTC for all the issues due within the next 24 hours. | Participants and Custom notification level with this event selected. | | Issue | Milestone changed | Subscribers and participants. | | Issue | Milestone removed | Subscribers and participants. | | Issue | New | Anyone mentioned by username in the description, with notification level "Mention" or higher. | diff --git a/doc/user/project/issues/due_dates.md b/doc/user/project/issues/due_dates.md index f0175b38bd6aba..56f301b0ac5765 100644 --- a/doc/user/project/issues/due_dates.md +++ b/doc/user/project/issues/due_dates.md @@ -30,8 +30,8 @@ Due dates are supported in: - [Incidents](../../../operations/incident_management/incidents.md) The day before an open item is due, an email is sent to all participants. -Like the due date, the "day before the due date" is determined by the -server's time zone. + +The email notification is sent at 00:50 UTC for all the issues due within the next 24 hours. Due dates also appear in your [to-do items](../../todos.md). diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 01b2a1d229f60f..07f51e9ea04176 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -40138,7 +40138,7 @@ msgstr "" msgid "NotificationEvent|Issue is created" msgstr "" -msgid "NotificationEvent|Issue is due soon" +msgid "NotificationEvent|Issue is due the next day" msgstr "" msgid "NotificationEvent|Issue is reassigned" -- GitLab From 7eb6ca1de78e8666413ae3cc31f57f25560429ef Mon Sep 17 00:00:00 2001 From: Marcin Sedlak-Jakubowski Date: Tue, 8 Apr 2025 20:10:42 +0200 Subject: [PATCH 2/3] Change UI setting to "due tomorrow" --- app/assets/javascripts/notifications/constants.js | 2 +- locale/gitlab.pot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/notifications/constants.js b/app/assets/javascripts/notifications/constants.js index f126e93fccba77..7af26699bd12b0 100644 --- a/app/assets/javascripts/notifications/constants.js +++ b/app/assets/javascripts/notifications/constants.js @@ -42,7 +42,7 @@ export const i18n = { close_merge_request: s__('NotificationEvent|Merge request is closed'), failed_pipeline: s__('NotificationEvent|Pipeline fails'), fixed_pipeline: s__('NotificationEvent|Pipeline is fixed'), - issue_due: s__('NotificationEvent|Issue is due the next day'), + issue_due: s__('NotificationEvent|Issue is due tomorrow'), merge_merge_request: s__('NotificationEvent|Merge request is merged'), moved_project: s__('NotificationEvent|Project is moved'), new_epic: s__('NotificationEvent|Epic is created'), diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 07f51e9ea04176..0afad62a7b8d68 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -40138,7 +40138,7 @@ msgstr "" msgid "NotificationEvent|Issue is created" msgstr "" -msgid "NotificationEvent|Issue is due the next day" +msgid "NotificationEvent|Issue is due tomorrow" msgstr "" msgid "NotificationEvent|Issue is reassigned" -- GitLab From e9e317022885248e5c8a20de5efd6ee4e5f987ed Mon Sep 17 00:00:00 2001 From: Marcin Sedlak-Jakubowski Date: Tue, 8 Apr 2025 20:12:45 +0200 Subject: [PATCH 3/3] Correct notification explanation --- doc/user/profile/notifications.md | 2 +- doc/user/project/issues/due_dates.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/user/profile/notifications.md b/doc/user/profile/notifications.md index ea55aaa762bb04..17059b0e3f9a86 100644 --- a/doc/user/profile/notifications.md +++ b/doc/user/profile/notifications.md @@ -262,7 +262,7 @@ epics: | Epic | Reopened | Subscribers and participants. | | Issue | Closed | Subscribers and participants. | -| Issue | Due the next day. The notification is sent at 00:50 UTC for all the issues due within the next 24 hours. | Participants and Custom notification level with this event selected. | +| Issue | Due tomorrow. The notification is sent at 00:50 in the server's time zone (for GitLab.com this is UTC) for open issues with a due date of the next calendar day. | Participants and Custom notification level with this event selected. | | Issue | Milestone changed | Subscribers and participants. | | Issue | Milestone removed | Subscribers and participants. | | Issue | New | Anyone mentioned by username in the description, with notification level "Mention" or higher. | diff --git a/doc/user/project/issues/due_dates.md b/doc/user/project/issues/due_dates.md index 56f301b0ac5765..46ba6447b7ed50 100644 --- a/doc/user/project/issues/due_dates.md +++ b/doc/user/project/issues/due_dates.md @@ -31,7 +31,8 @@ Due dates are supported in: The day before an open item is due, an email is sent to all participants. -The email notification is sent at 00:50 UTC for all the issues due within the next 24 hours. +The notification is sent at 00:50 in the server's time zone (for GitLab.com this is UTC) +for all open items with a due date of the next calendar day. Due dates also appear in your [to-do items](../../todos.md). -- GitLab