summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-08-07 18:47:02 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-08-07 18:47:02 -0400
commita71bed53e0aceb10b8e97d490a0d0486a8d47e72 (patch)
tree570916ac5afd42c15396bbaa5f9c0ef5a1f01a6a /doc
parent8ab6bd3eb3b49c6ca557b3053105de81af31ca51 (diff)
parent4f24eb2aa670877faeef0f486af00d74e007ad01 (diff)
downloadgitlab-ce-a71bed53e0aceb10b8e97d490a0d0486a8d47e72.tar.gz
Merge branch 'merge-notifs' into 'master'
See merge request !1077
Diffstat (limited to 'doc')
-rw-r--r--doc/workflow/notifications.md39
1 files changed, 28 insertions, 11 deletions
diff --git a/doc/workflow/notifications.md b/doc/workflow/notifications.md
index 2b5f06dd1fa..025992deece 100644
--- a/doc/workflow/notifications.md
+++ b/doc/workflow/notifications.md
@@ -52,18 +52,35 @@ Below is the table of events users can be notified of:
| New SSH key added | User | Security email, always sent. |
| New email added | User | Security email, always sent. |
| New user created | User | Sent on user creation, except for omniauth (LDAP)|
-| New issue created | Issue assignee [1], project members [2] | [1] not disabled, [2] higher than participating |
| User added to project | User | Sent when user is added to project |
| Project access level changed | User | Sent when user project access level is changed |
| User added to group | User | Sent when user is added to group |
-| Project moved | Project members [1] | [1] not disabled |
| Group access level changed | User | Sent when user group access level is changed |
-| Close issue | Issue author [1], issue assignee [2], project members [3] | [1] [2] not disabled, [3] higher than participating |
-| Reassign issue | New issue assignee [1], old issue assignee [2] | [1] [2] not disabled |
-| Reopen issue | Project members [1] | [1] higher than participating |
-| New merge request | MR assignee [1] | [1] not disabled |
-| Reassign merge request | New MR assignee [1], old MR assignee [2] | [1] [2] not disabled |
-| Close merge request | MR author [1], MR assignee [2], project members [3] | [1] [2] not disabled, [3] higher than participating |
-| Reopen merge request | Project members [1] | [1] higher than participating |
-| Merge merge request | MR author [1], MR assignee [2], project members [3] | [1] [2] not disabled, [3] higher than participating |
-| New comment | Mentioned users [1], users participating [2], project members [3] | [1] [2] not disabled, [3] higher than participating |
+| Project moved | Project members [1] | [1] not disabled |
+
+### Issue / Merge Request events
+
+In all of the below cases, the notification will be sent to:
+- Participants:
+ - the author and assignee of the issue/merge request
+ - authors of comments on the issue/merge request
+ - anyone mentioned by `@username` in the issue/merge request description
+ - anyone mentioned by `@username` in any of the comments on the issue/merge request
+
+ ...with notification level "Participating" or higher
+
+- Watchers: project members with notification level "Watch"
+- Subscribers: anyone who manually subscribed to the issue/merge request
+
+| Event | Sent to |
+|------------------------|---------|
+| New issue | |
+| Close issue | |
+| Reassign issue | The above, plus the old assignee |
+| Reopen issue | |
+| New merge request | |
+| Reassign merge request | The above, plus the old assignee |
+| Close merge request | |
+| Reopen merge request | |
+| Merge merge request | |
+| New comment | The above, plus anyone mentioned by `@username` in the comment, with notification level "Mention" or higher |