diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2017-05-22 17:27:39 +0000 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2017-05-22 17:27:39 +0000 |
| commit | 010a9c6be28f4e73a2926832cc4fa7a574d858ba (patch) | |
| tree | 748afd8bb2084fb5dac33eb0a833e3ed892a5d1c | |
| parent | 33eb47d7daf7907b82bf5119e3438fea0dea22f4 (diff) | |
| parent | 20aab3c85f8d29597f45618af55824288b329839 (diff) | |
| download | gitlab-ce-010a9c6be28f4e73a2926832cc4fa7a574d858ba.tar.gz | |
Merge branch 'notification-settings-doc' into 'master'
Add project and group notification settings info
See merge request !11507
| -rw-r--r-- | doc/workflow/img/notification_global_settings.png (renamed from doc/workflow/notifications/settings.png) | bin | 37542 -> 37542 bytes | |||
| -rw-r--r-- | doc/workflow/img/notification_group_settings.png | bin | 0 -> 171784 bytes | |||
| -rw-r--r-- | doc/workflow/img/notification_project_settings.png | bin | 0 -> 167548 bytes | |||
| -rw-r--r-- | doc/workflow/notifications.md | 10 |
4 files changed, 7 insertions, 3 deletions
diff --git a/doc/workflow/notifications/settings.png b/doc/workflow/img/notification_global_settings.png Binary files differindex 8a5494d16a8..8a5494d16a8 100644 --- a/doc/workflow/notifications/settings.png +++ b/doc/workflow/img/notification_global_settings.png diff --git a/doc/workflow/img/notification_group_settings.png b/doc/workflow/img/notification_group_settings.png Binary files differnew file mode 100644 index 00000000000..fc096f46901 --- /dev/null +++ b/doc/workflow/img/notification_group_settings.png diff --git a/doc/workflow/img/notification_project_settings.png b/doc/workflow/img/notification_project_settings.png Binary files differnew file mode 100644 index 00000000000..006432f65c9 --- /dev/null +++ b/doc/workflow/img/notification_project_settings.png diff --git a/doc/workflow/notifications.md b/doc/workflow/notifications.md index e91d36987a9..3e2e7d0f7b6 100644 --- a/doc/workflow/notifications.md +++ b/doc/workflow/notifications.md @@ -6,7 +6,7 @@ GitLab has a notification system in place to notify a user of events that are im You can find notification settings under the user profile. - + Notification settings are divided into three groups: @@ -32,19 +32,23 @@ anything that is set at Global Settings. #### Group Settings + + Group Settings are taking precedence over Global Settings but are on a level below Project Settings. This means that you can set a different level of notifications per group while still being able to have a finer level setting per project. Organization like this is suitable for users that belong to different groups but don't have the same need for being notified for every group they are member of. -These settings can be configured on group page or user profile notifications dropdown. +These settings can be configured on group page under the name of the group. It will be the dropdown with the bell icon. They can also be configured on the user profile notifications dropdown. #### Project Settings + + Project Settings are at the top level and any setting placed at this level will take precedence of any other setting. This is suitable for users that have different needs for notifications per project basis. -These settings can be configured on project page or user profile notifications dropdown. +These settings can be configured on project page under the name of the project. It will be the dropdown with the bell icon. They can also be configured on the user profile notifications dropdown. ## Notification events |
