Merge branch 'fe-fix-issuable-sidebar-icon-of-notification-disabled' into 'master'
Fix issuable sidebar icon of notification disabled See merge request gitlab-org/gitlab-ce!32134
This commit is contained in:
commit
a93612aa5f
3 changed files with 10 additions and 3 deletions
|
@ -106,9 +106,9 @@ module NotificationsHelper
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def notification_setting_icon(notification_setting)
|
def notification_setting_icon(notification_setting = nil)
|
||||||
sprite_icon(
|
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"
|
css_class: "icon notifications-icon js-notifications-icon"
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
|
@ -139,7 +139,9 @@
|
||||||
- if signed_in
|
- if signed_in
|
||||||
- if issuable_sidebar[:project_emails_disabled]
|
- if issuable_sidebar[:project_emails_disabled]
|
||||||
.block.js-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
|
- else
|
||||||
.js-sidebar-subscriptions-entry-point
|
.js-sidebar-subscriptions-entry-point
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Fix issuable sidebar icon on notification disabled
|
||||||
|
merge_request: 32134
|
||||||
|
author:
|
||||||
|
type: fixed
|
Loading…
Reference in a new issue