diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-25 23:04:35 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-25 23:04:35 +0300 |
commit | 8fc0eed357342a887bdd80fffdf480a83d9fd65f (patch) | |
tree | a1db3222a60a93294872447cfefd8e5517a8295c /lib | |
parent | 3d115d6748aff3888819b1bb4641e805a2ecd38b (diff) | |
parent | 13f7ba059e48ebf090d8f8ae440f277097494c52 (diff) |
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')
-rw-r--r-- | lib/award_emoji.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/award_emoji.rb b/lib/award_emoji.rb index 5f8ff01b0a9..b1aecc2e671 100644 --- a/lib/award_emoji.rb +++ b/lib/award_emoji.rb @@ -52,6 +52,10 @@ class AwardEmoji end end + def self.unicode + @unicode ||= emojis.map {|key, value| { key => emojis[key]["unicode"] } }.inject(:merge!) + end + def self.aliases @aliases ||= begin json_path = File.join(Rails.root, 'fixtures', 'emojis', 'aliases.json' ) |