diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-14 13:24:10 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-14 13:24:10 +0000 |
| commit | ef03f4a4297ea5172280f5461024dd78c32132d0 (patch) | |
| tree | 70af19ada6d09fb0d3db93647e0faae029030f04 | |
| parent | 5d59890b9de69a286f833f634f87fc18ddf0db7b (diff) | |
| parent | f174800b207d8bcbab46bdbeb65bf219eecf6d83 (diff) | |
| download | gitlab-ce-ef03f4a4297ea5172280f5461024dd78c32132d0.tar.gz | |
Merge branch 'notification_level_note' into 'master'
Notification level note
Fixes #1406
See merge request !1174
| -rw-r--r-- | app/views/profiles/notifications/show.html.haml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml index f84de4430cc..a044fad8fa3 100644 --- a/app/views/profiles/notifications/show.html.haml +++ b/app/views/profiles/notifications/show.html.haml @@ -31,12 +31,12 @@ .clearfix %hr - %p - You can also specify notification level per group or per project - %br - By default all projects and groups uses notification level set above .row.all-notifications .col-md-6 + %p + You can also specify notification level per group or per project. + %br + By default all projects and groups uses notification level set above. %h4 Groups: %ul.bordered-list - @group_members.each do |users_group| @@ -44,6 +44,10 @@ = render 'settings', type: 'group', membership: users_group, notification: notification .col-md-6 + %p + To specify notification level per project of a group you belong to, + %br + you need to be a member of the project itself, not only its group. %h4 Projects: %ul.bordered-list - @project_members.each do |project_member| |