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 10:43:25 +0200 |
| commit | 908700e121a9b5cb3a8715944816d29fbd40c46c (patch) | |
| tree | 67cae40018779fbd5cc7a3d7850ab749abd75a51 | |
| parent | 1755b1643c97d835ac14232dbd02de099336dd7d (diff) | |
| download | gitlab-ce-908700e121a9b5cb3a8715944816d29fbd40c46c.tar.gz | |
Merge branch 'notification-settings-save' into 'master'
Fixed issue with notification settings not saving
Closes #14736
See merge request !3452
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/profiles/notifications/show.html.haml | 33 |
2 files changed, 18 insertions, 16 deletions
diff --git a/CHANGELOG b/CHANGELOG index b68c0099fd7..d860e5f5c6b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -22,6 +22,7 @@ v 8.6.2 - Remove tabstop from the WIP toggle links. !3426 - Ensure private project snippets are not viewable by unauthorized people. - Gracefully handle notes on deleted commits in merge requests (Stan Hu). !3402 + - Fixed issue with notification settings not saving. !3452 v 8.6.1 - Add option to reload the schema before restoring a database backup. !2807 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 |