summaryrefslogtreecommitdiff
path: root/lib/support/nginx/gitlab-ssl
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-04-25 20:04:35 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-04-25 20:04:35 +0000
commit8fc0eed357342a887bdd80fffdf480a83d9fd65f (patch)
treea1db3222a60a93294872447cfefd8e5517a8295c /lib/support/nginx/gitlab-ssl
parent3d115d6748aff3888819b1bb4641e805a2ecd38b (diff)
parent13f7ba059e48ebf090d8f8ae440f277097494c52 (diff)
downloadgitlab-ce-8fc0eed357342a887bdd80fffdf480a83d9fd65f.tar.gz
Merge branch 'emoji-unicode-fix' into 'master'
Fixes issue with emoji comments not showing correct emoji image Previously it would look for the unicode character inside the award menu. But this menu might not always be there. Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character Fixes #15512 See merge request !3885
Diffstat (limited to 'lib/support/nginx/gitlab-ssl')
0 files changed, 0 insertions, 0 deletions