diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-04-27 12:48:05 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-04-27 12:48:05 -0400 |
commit | f50306a7b15035bf73ba45c2f0d754de5e33631b (patch) | |
tree | bf760e5663f3abda983a68293aa97ae143bdcf7c /lib | |
parent | 6044fd7e4622253410f856877d5a00fc4ced8062 (diff) | |
parent | a1db1355d2b1e1b81e5afc8211d8111d4a3cf822 (diff) | |
download | gitlab-ce-f50306a7b15035bf73ba45c2f0d754de5e33631b.tar.gz |
Merge remote-tracking branch 'origin/8-7-stable' into 'dev/8-7-stable'
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' ) |