Commit 381213cc authored by Marcin Sedlak-Jakubowski's avatar Marcin Sedlak-Jakubowski

Merge branch 'gottesman.rachelg-master-patch-39675' into 'master'

Fix future tense issues

See merge request gitlab-org/gitlab!49300
parents 438899e7 c076e771
...@@ -13,12 +13,12 @@ Notifications are sent via email. ...@@ -13,12 +13,12 @@ Notifications are sent via email.
## Receiving notifications ## Receiving notifications
You will receive notifications for one of the following reasons: You receive notifications for one of the following reasons:
- You participate in an issue, merge request, epic or design. In this context, _participate_ means comment, or edit. - You participate in an issue, merge request, epic or design. In this context, _participate_ means comment, or edit.
- You enable notifications in an issue, merge request, or epic. To enable notifications, click the **Notifications** toggle in the sidebar to _on_. - You enable notifications in an issue, merge request, or epic. To enable notifications, click the **Notifications** toggle in the sidebar to _on_.
While notifications are enabled, you will receive notification of actions occurring in that issue, merge request, or epic. While notifications are enabled, you receive notification of actions occurring in that issue, merge request, or epic.
NOTE: NOTE:
Notifications can be blocked by an admin, preventing them from being sent. Notifications can be blocked by an admin, preventing them from being sent.
...@@ -50,7 +50,7 @@ These notification settings apply only to you. They do not affect the notificati ...@@ -50,7 +50,7 @@ These notification settings apply only to you. They do not affect the notificati
Your **Global notification settings** are the default settings unless you select different values for a project or a group. Your **Global notification settings** are the default settings unless you select different values for a project or a group.
- Notification email - Notification email
- This is the email address your notifications will be sent to. - This is the email address your notifications are sent to.
- Global notification level - Global notification level
- This is the default [notification level](#notification-levels) which applies to all your notifications. - This is the default [notification level](#notification-levels) which applies to all your notifications.
- Receive notifications about your own activity. - Receive notifications about your own activity.
...@@ -138,7 +138,7 @@ For each project and group you can select one of the following levels: ...@@ -138,7 +138,7 @@ For each project and group you can select one of the following levels:
## Notification events ## Notification events
Users will be notified of the following events: Users are notified of the following events:
| Event | Sent to | Settings level | | Event | Sent to | Settings level |
|------------------------------|---------------------|------------------------------| |------------------------------|---------------------|------------------------------|
...@@ -158,7 +158,7 @@ Users will be notified of the following events: ...@@ -158,7 +158,7 @@ Users will be notified of the following events:
## Issue / Epics / Merge request events ## Issue / Epics / Merge request events
In most of the below cases, the notification will be sent to: In most of the below cases, the notification is sent to:
- Participants: - Participants:
- the author and assignee of the issue/merge request - the author and assignee of the issue/merge request
...@@ -193,23 +193,23 @@ To minimize the number of notifications that do not require any action, from [Gi ...@@ -193,23 +193,23 @@ To minimize the number of notifications that do not require any action, from [Gi
| New comment | The above, plus anyone mentioned by `@username` in the comment, with notification level "Mention" or higher | | New comment | The above, plus anyone mentioned by `@username` in the comment, with notification level "Mention" or higher |
| Failed pipeline | The author of the pipeline | | Failed pipeline | The author of the pipeline |
| Fixed pipeline | The author of the pipeline. Enabled by default. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/24309) in GitLab 13.1. | | Fixed pipeline | The author of the pipeline. Enabled by default. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/24309) in GitLab 13.1. |
| Successful pipeline | The author of the pipeline, if they have the custom notification setting for successful pipelines set. If the pipeline failed previously, a `Fixed pipeline` message will be sent for the first successful pipeline after the failure, then a `Successful pipeline` message for any further successful pipelines. | | Successful pipeline | The author of the pipeline, if they have the custom notification setting for successful pipelines set. If the pipeline failed previously, a `Fixed pipeline` message is sent for the first successful pipeline after the failure, then a `Successful pipeline` message for any further successful pipelines. |
| New epic **(ULTIMATE)** | | | New epic **(ULTIMATE)** | |
| Close epic **(ULTIMATE)** | | | Close epic **(ULTIMATE)** | |
| Reopen epic **(ULTIMATE)** | | | Reopen epic **(ULTIMATE)** | |
In addition, if the title or description of an Issue or Merge Request is In addition, if the title or description of an Issue or Merge Request is
changed, notifications will be sent to any **new** mentions by `@username` as changed, notifications are sent to any **new** mentions by `@username` as
if they had been mentioned in the original text. if they had been mentioned in the original text.
You won't receive notifications for Issues, Merge Requests or Milestones created You don't receive notifications for Issues, Merge Requests or Milestones created
by yourself (except when an issue is due). You will only receive automatic by yourself (except when an issue is due). You only receive automatic
notifications when somebody else comments or adds changes to the ones that notifications when somebody else comments or adds changes to the ones that
you've created or mentions you. you've created or mentions you.
If an open merge request becomes unmergeable due to conflict, its author will be notified about the cause. If an open merge request becomes unmergeable due to conflict, its author is notified about the cause.
If a user has also set the merge request to automatically merge once pipeline succeeds, If a user has also set the merge request to automatically merge once pipeline succeeds,
then that user will also be notified. then that user is also notified.
## Design email notifications ## Design email notifications
...@@ -252,7 +252,7 @@ The `X-GitLab-NotificationReason` header contains the reason for the notificatio ...@@ -252,7 +252,7 @@ The `X-GitLab-NotificationReason` header contains the reason for the notificatio
- `mentioned` - `mentioned`
The reason for the notification is also included in the footer of the notification email. For example an email with the The reason for the notification is also included in the footer of the notification email. For example an email with the
reason `assigned` will have this sentence in the footer: reason `assigned` has this sentence in the footer:
- `You are receiving this email because you have been assigned an item on <configured GitLab hostname>.` - `You are receiving this email because you have been assigned an item on <configured GitLab hostname>.`
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment