diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-06-17 12:26:32 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-06-17 12:33:11 -0300 |
| commit | ab236c76247d83c190b148acbffa48f244414553 (patch) | |
| tree | 69b17bdec6f52d96d1e4d7a807f3432263ef3cd4 /app/views/profiles/notifications | |
| parent | a4b078bfb8b99a9852eb55abd498d65a374375e3 (diff) | |
| download | gitlab-ce-ab236c76247d83c190b148acbffa48f244414553.tar.gz | |
Allow users to set custom notifications in projects they don't own and several fixes to code
Diffstat (limited to 'app/views/profiles/notifications')
3 files changed, 7 insertions, 7 deletions
diff --git a/app/views/profiles/notifications/_group_settings.html.haml b/app/views/profiles/notifications/_group_settings.html.haml index 04becd5d860..80c165db01b 100644 --- a/app/views/profiles/notifications/_group_settings.html.haml +++ b/app/views/profiles/notifications/_group_settings.html.haml @@ -9,4 +9,4 @@ = link_to group.name, group_path(group) .pull-right - = render 'notifications/buttons/notifications', notification_setting: setting + = render '/shared/notifications/buttons/button', notification_setting: setting diff --git a/app/views/profiles/notifications/_project_settings.html.haml b/app/views/profiles/notifications/_project_settings.html.haml index 664a17418db..e1a06a75e0c 100644 --- a/app/views/profiles/notifications/_project_settings.html.haml +++ b/app/views/profiles/notifications/_project_settings.html.haml @@ -9,4 +9,4 @@ = link_to_project(project) .pull-right - = render 'notifications/buttons/notifications', notification_setting: setting + = render '/shared/notifications/buttons/button', notification_setting: setting diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml index cfbb4d79da2..cd0112d6278 100644 --- a/app/views/profiles/notifications/show.html.haml +++ b/app/views/profiles/notifications/show.html.haml @@ -25,11 +25,11 @@ = f.label :notification_email, class: "label-light" = f.select :notification_email, @user.all_emails, { include_blank: false }, class: "select2" - = label_tag :global_notification_level, "Global notification level", class: "label-light" - %br - .clearfix - .form-group.pull-left - = render 'notifications/buttons/notifications', notification_setting: @global_notification_setting, left_align: true + = label_tag :global_notification_level, "Global notification level", class: "label-light" + %br + .clearfix + .form-group.pull-left + = render '/shared/notifications/buttons/button', notification_setting: @global_notification_setting, left_align: true .clearfix |