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
eeac5946
Commit
eeac5946
authored
May 18, 2020
by
peterhegman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Whitelist `gl-emoji` data attributes in tooltips
To prevent them from being removed
parent
b5e91ff8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
app/assets/javascripts/commons/bootstrap.js
app/assets/javascripts/commons/bootstrap.js
+6
-1
changelogs/unreleased/28589-emoji-status-popover-doesn-t-show-emoji-when-it-s-in-the-message.yml
...s-popover-doesn-t-show-emoji-when-it-s-in-the-message.yml
+5
-0
No files found.
app/assets/javascripts/commons/bootstrap.js
View file @
eeac5946
...
...
@@ -70,7 +70,12 @@ whitelist.acronym = [];
whitelist
.
blockquote
=
[];
whitelist
.
del
=
[];
whitelist
.
ins
=
[];
whitelist
[
'
gl-emoji
'
]
=
[];
whitelist
[
'
gl-emoji
'
]
=
[
'
data-name
'
,
'
data-unicode-version
'
,
'
data-fallback-src
'
,
'
data-fallback-sprite-class
'
,
];
// Whitelisting SVG tags and attributes
whitelist
.
svg
=
[
'
viewBox
'
];
...
...
changelogs/unreleased/28589-emoji-status-popover-doesn-t-show-emoji-when-it-s-in-the-message.yml
0 → 100644
View file @
eeac5946
---
title
:
Fix rendering of emojis in status tooltips
merge_request
:
32604
author
:
type
:
fixed
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