diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-03-30 08:42:13 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-30 08:42:13 +0000 |
| commit | 7b2af8740dfa080bcb880fef64de4b99e2255dd4 (patch) | |
| tree | 1f77f71e5611e90b77fe51563b71afe7682eccde | |
| parent | a9346cab20f7e54a849877e2aa8601b8b3707652 (diff) | |
| parent | 0a7974e584af98cf584348cc7daa658e32450284 (diff) | |
| download | gitlab-ce-7b2af8740dfa080bcb880fef64de4b99e2255dd4.tar.gz | |
Merge branch 'notification-settings-save' into 'master'
Fixed issue with notification settings not saving
Closes #14736
See merge request !3452
| -rw-r--r-- | app/views/profiles/notifications/show.html.haml | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml index de80abd7f4d..3d15c0d932b 100644 --- a/app/views/profiles/notifications/show.html.haml +++ b/app/views/profiles/notifications/show.html.haml @@ -56,19 +56,20 @@ .prepend-top-default = f.submit 'Update settings', class: "btn btn-create" %hr - %h5 - Groups (#{@group_members.count}) - %div - %ul.bordered-list - - @group_members.each do |group_member| - - notification = Notification.new(group_member) - = render 'settings', type: 'group', membership: group_member, notification: notification - %h5 - Projects (#{@project_members.count}) - %p.account-well - 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. - .append-bottom-default - %ul.bordered-list - - @project_members.each do |project_member| - - notification = Notification.new(project_member) - = render 'settings', type: 'project', membership: project_member, notification: notification +.col-lg-9.col-lg-push-3 + %h5 + Groups (#{@group_members.count}) + %div + %ul.bordered-list + - @group_members.each do |group_member| + - notification = Notification.new(group_member) + = render 'settings', type: 'group', membership: group_member, notification: notification + %h5 + Projects (#{@project_members.count}) + %p.account-well + 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. + .append-bottom-default + %ul.bordered-list + - @project_members.each do |project_member| + - notification = Notification.new(project_member) + = render 'settings', type: 'project', membership: project_member, notification: notification |