Skip to content
Snippets Groups Projects
Commit 9ad0a8ad authored by Paul Slaughter's avatar Paul Slaughter Committed by Brett Walker
Browse files

Fix issuable sidebar icon of notification disabled

by adding the proper notification icon
parent ef0f1509
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -106,9 +106,9 @@ module NotificationsHelper
end
end
 
def notification_setting_icon(notification_setting)
def notification_setting_icon(notification_setting = nil)
sprite_icon(
notification_setting.disabled? ? "notifications-off" : "notifications",
!notification_setting.present? || notification_setting.disabled? ? "notifications-off" : "notifications",
css_class: "icon notifications-icon js-notifications-icon"
)
end
Loading
Loading
Loading
Loading
@@ -139,7 +139,9 @@
- if signed_in
- if issuable_sidebar[:project_emails_disabled]
.block.js-emails-disabled
= notification_description(:owner_disabled)
.sidebar-collapsed-icon.has-tooltip{ title: notification_description(:owner_disabled), data: { placement: "left", container: "body", boundary: 'viewport' } }
= notification_setting_icon
.hide-collapsed= notification_description(:owner_disabled)
- else
.js-sidebar-subscriptions-entry-point
 
Loading
Loading
---
title: Fix issuable sidebar icon on notification disabled
merge_request: 32134
author:
type: fixed
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment