Commit 7b2af874 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'notification-settings-save' into 'master'

Fixed issue with notification settings not saving

Closes #14736

See merge request !3452
parents a9346cab 0a7974e5
...@@ -56,19 +56,20 @@ ...@@ -56,19 +56,20 @@
.prepend-top-default .prepend-top-default
= f.submit 'Update settings', class: "btn btn-create" = f.submit 'Update settings', class: "btn btn-create"
%hr %hr
%h5 .col-lg-9.col-lg-push-3
Groups (#{@group_members.count}) %h5
%div Groups (#{@group_members.count})
%ul.bordered-list %div
- @group_members.each do |group_member| %ul.bordered-list
- notification = Notification.new(group_member) - @group_members.each do |group_member|
= render 'settings', type: 'group', membership: group_member, notification: notification - notification = Notification.new(group_member)
%h5 = render 'settings', type: 'group', membership: group_member, notification: notification
Projects (#{@project_members.count}) %h5
%p.account-well Projects (#{@project_members.count})
To specify the notification level per project of a group you belong to, you need to be a member of the project itself, not only its group. %p.account-well
.append-bottom-default To specify the notification level per project of a group you belong to, you need to be a member of the project itself, not only its group.
%ul.bordered-list .append-bottom-default
- @project_members.each do |project_member| %ul.bordered-list
- notification = Notification.new(project_member) - @project_members.each do |project_member|
= render 'settings', type: 'project', membership: project_member, notification: notification - notification = Notification.new(project_member)
= render 'settings', type: 'project', membership: project_member, notification: notification
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