Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
1048cdbd
Commit
1048cdbd
authored
Sep 22, 2020
by
Martin Wortschack
Committed by
Markus Koller
Sep 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Notification icons: Render empty string for "custom" setting
parent
246852ee
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
1 deletion
+10
-1
app/helpers/notifications_helper.rb
app/helpers/notifications_helper.rb
+4
-1
changelogs/unreleased/254224-notification-icons-missing-icon-for-custom.yml
...sed/254224-notification-icons-missing-icon-for-custom.yml
+5
-0
spec/helpers/notifications_helper_spec.rb
spec/helpers/notifications_helper_spec.rb
+1
-0
No files found.
app/helpers/notifications_helper.rb
View file @
1048cdbd
...
...
@@ -29,7 +29,10 @@ module NotificationsHelper
end
def
notification_icon
(
level
)
sprite_icon
(
"
#{
notification_icon_class
(
level
)
}
"
)
icon
=
notification_icon_class
(
level
)
return
''
unless
icon
sprite_icon
(
icon
)
end
def
notification_title
(
level
)
...
...
changelogs/unreleased/254224-notification-icons-missing-icon-for-custom.yml
0 → 100644
View file @
1048cdbd
---
title
:
'
Notifications
icon:
Render
empty
string
for
custom
setting'
merge_request
:
42848
author
:
type
:
other
spec/helpers/notifications_helper_spec.rb
View file @
1048cdbd
...
...
@@ -10,6 +10,7 @@ RSpec.describe NotificationsHelper do
it
{
expect
(
notification_icon
(
:mention
)).
to
match
(
'data-testid="at-icon"'
)
}
it
{
expect
(
notification_icon
(
:global
)).
to
match
(
'data-testid="earth-icon'
)
}
it
{
expect
(
notification_icon
(
:watch
)).
to
match
(
'data-testid="eye-icon"'
)
}
it
{
expect
(
notification_icon
(
:custom
)).
to
equal
(
''
)
}
end
describe
'notification_title'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment