diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-06-02 16:37:17 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-06-13 15:51:11 -0300 |
| commit | 0cf035230315276d240c16c013b179d6d3be2a72 (patch) | |
| tree | e4a3c98d073a5f4c780258ab17d51cdb11648ef1 | |
| parent | dc2ca594331ff532b1bbb0ba53725644dc4cdc41 (diff) | |
| download | gitlab-ce-0cf035230315276d240c16c013b179d6d3be2a72.tar.gz | |
Add notification settings documentation and update screenshot
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | doc/workflow/notifications.md | 6 | ||||
| -rw-r--r-- | doc/workflow/notifications/settings.png | bin | 114727 -> 88149 bytes |
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 7a6a14919da..1c73e385bd6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -45,6 +45,7 @@ v 8.9.0 (unreleased) - Remove 'main language' feature - Pipelines can be canceled only when there are running builds - Use downcased path to container repository as this is expected path by Docker + - Custom notification level for projects - Projects pending deletion will render a 404 page - Measure queue duration between gitlab-workhorse and Rails - Make Omniauth providers specs to not modify global configuration diff --git a/doc/workflow/notifications.md b/doc/workflow/notifications.md index cbca94c0b5e..98f44a5b07b 100644 --- a/doc/workflow/notifications.md +++ b/doc/workflow/notifications.md @@ -4,7 +4,7 @@ GitLab has a notification system in place to notify a user of events that are im ## Notification settings -Under user profile page you can find the notification settings. +You can find notification settings under the user profile.  @@ -20,6 +20,7 @@ Each of these settings have levels of notification: * Participating - receive notifications from related resources * Watch - receive notifications from projects or groups user is a member of * Global - notifications as set at the global settings +* Custom - Notification is set based on events selected by the user.(Available only in project level) #### Global Settings @@ -55,7 +56,7 @@ Below is the table of events users can be notified of: | 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 | -| Group access level changed | User | Sent when user group access level is changed | +| Group access level changed | User | Sent when user group access level is changed | | Project moved | Project members [1] | [1] not disabled | ### Issue / Merge Request events @@ -71,6 +72,7 @@ In all of the below cases, the notification will be sent to: - Watchers: users with notification level "Watch" - Subscribers: anyone who manually subscribed to the issue/merge request +- Custom: Users with notification level "custom" who turned on notifications for any of the events present in the table below | Event | Sent to | |------------------------|---------| diff --git a/doc/workflow/notifications/settings.png b/doc/workflow/notifications/settings.png Binary files differindex e5b50ee2494..1628e2d568c 100644 --- a/doc/workflow/notifications/settings.png +++ b/doc/workflow/notifications/settings.png |
