diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-08-23 22:01:11 +0000 |
|---|---|---|
| committer | 🤖 GitLab Bot 🤖 <gitlab-bot@gitlab.com> | 2019-08-23 22:19:56 +0000 |
| commit | 913aff3ce27a7307aab0913ad34309013673fd63 (patch) | |
| tree | a32d31ae0e7d958377f4cffae704dc6b71da42a2 | |
| parent | 10dd303170516ec03825dcceadac39967445917e (diff) | |
| download | gitlab-ce-12-2-auto-deploy-20190818.tar.gz | |
Merge branch 'fe-fix-issuable-sidebar-icon-of-notification-disabled' into 'master'12-2-auto-deploy-20190818
Fix issuable sidebar icon of notification disabled
See merge request gitlab-org/gitlab-ce!32134
(cherry picked from commit a93612aa5fab7d70f0b6165856402ac53ab18faf)
9ad0a8ad Fix issuable sidebar icon of notification disabled
| -rw-r--r-- | app/helpers/notifications_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/fe-fix-issuable-sidebar-icon-of-notification-disabled.yml | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb index 5678304ffcf..8855e0cdd70 100644 --- a/app/helpers/notifications_helper.rb +++ b/app/helpers/notifications_helper.rb @@ -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 diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 825088a58e7..245886f495c 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -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 diff --git a/changelogs/unreleased/fe-fix-issuable-sidebar-icon-of-notification-disabled.yml b/changelogs/unreleased/fe-fix-issuable-sidebar-icon-of-notification-disabled.yml new file mode 100644 index 00000000000..736e12ff694 --- /dev/null +++ b/changelogs/unreleased/fe-fix-issuable-sidebar-icon-of-notification-disabled.yml @@ -0,0 +1,5 @@ +--- +title: Fix issuable sidebar icon on notification disabled +merge_request: 32134 +author: +type: fixed |