diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-09-18 20:25:23 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-09-18 20:29:32 +0300 |
| commit | 6a4ee9aa7140862075cafae1ddebd133eec52b5b (patch) | |
| tree | 9890bb5c906a0d6e207149ae5fe1df84d213fa7c /lib/gitlab/emoji.rb | |
| parent | 9ae92b8caa6c11d8860f86b7d6378062215d1b72 (diff) | |
Allow simple ivar ||= form. Update accordingly
Diffstat (limited to 'lib/gitlab/emoji.rb')
| -rw-r--r-- | lib/gitlab/emoji.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/gitlab/emoji.rb b/lib/gitlab/emoji.rb index c8689d85c0c..89cf659bce4 100644 --- a/lib/gitlab/emoji.rb +++ b/lib/gitlab/emoji.rb @@ -1,4 +1,3 @@ -# rubocop:disable Cop/ModuleWithInstanceVariables module Gitlab module Emoji extend self @@ -32,8 +31,7 @@ module Gitlab end def emoji_unicode_version(name) - @emoji_unicode_versions_by_name ||= JSON.parse(File.read(Rails.root.join('fixtures', 'emojis', 'emoji-unicode-version-map.json'))) - @emoji_unicode_versions_by_name[name] + emoji_unicode_versions_by_name[name] end def normalize_emoji_name(name) @@ -57,5 +55,12 @@ module Gitlab ActionController::Base.helpers.content_tag('gl-emoji', emoji_info['moji'], title: emoji_info['description'], data: data) end + + private + + def emoji_unicode_versions_by_name + @emoji_unicode_versions_by_name ||= + JSON.parse(File.read(Rails.root.join('fixtures', 'emojis', 'emoji-unicode-version-map.json'))) + end end end |