diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-21 21:08:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-21 21:08:31 +0000 |
| commit | e7bc93852d0ce48c490a780b6a1adc6cc36dd342 (patch) | |
| tree | b07651f4700e8ec2338298b4d224b6252b505eef /app/assets/javascripts/commons | |
| parent | 34e72e54129090eaae6e045890fcdf8b5ad3f629 (diff) | |
| download | gitlab-ce-e7bc93852d0ce48c490a780b6a1adc6cc36dd342.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/commons')
| -rw-r--r-- | app/assets/javascripts/commons/bootstrap.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/commons/bootstrap.js b/app/assets/javascripts/commons/bootstrap.js index e5e1cbb1e62..df0fa1ae88b 100644 --- a/app/assets/javascripts/commons/bootstrap.js +++ b/app/assets/javascripts/commons/bootstrap.js @@ -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']; |