summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-06-16 15:42:54 +0100
committerPhil Hughes <me@iamphill.com>2016-06-16 15:42:54 +0100
commit24f5f071dcce529a3fbbc887ebce7bfc56353361 (patch)
treef47c911f0a550e5f56d12d73bb8f8edcf0e0022a /app/views
parent89a2c8730b5d1f69703b0879d5b6b7bd5d766695 (diff)
downloadgitlab-ce-24f5f071dcce529a3fbbc887ebce7bfc56353361.tar.gz
Added description to custom option in notification dropdown
Always shows the custom option in the dropdown
Diffstat (limited to 'app/views')
-rw-r--r--app/views/shared/projects/_notification_dropdown.html.haml10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/shared/projects/_notification_dropdown.html.haml b/app/views/shared/projects/_notification_dropdown.html.haml
index d7bea8b69fc..103d5f12f5c 100644
--- a/app/views/shared/projects/_notification_dropdown.html.haml
+++ b/app/views/shared/projects/_notification_dropdown.html.haml
@@ -2,8 +2,8 @@
- NotificationSetting.levels.each do |level|
- if level.first != "custom"
= notification_list_item(level.first, @notification_setting)
- - unless @notification_setting.custom?
- %li.divider
- %li
- %a.update-notification{ href: "#", role: "button", data: { toggle: "modal", target: "#custom-notifications-modal", notification_level: "custom", notification_title: "Custom" } }
- Custom
+ %li.divider
+ %li
+ %a.update-notification{ href: "#", role: "button", data: { toggle: "modal", target: "#custom-notifications-modal", notification_level: "custom", notification_title: "Custom" } }
+ %strong.dropdown-menu-inner-title Custom
+ %span.dropdown-menu-inner-content= notification_description("custom")