Add latest changes from gitlab-org/gitlab@master

1 files changed, 16 insertions, 52 deletions

diff --git a/lib/gitlab/emoji.rb b/lib/gitlab/emoji.rb
index 2b5f465d3c5..519b1d94bf5 100644
--- a/lib/gitlab/emoji.rb
+++ b/lib/gitlab/emoji.rb
@@ -4,40 +4,15 @@ module Gitlab
   module Emoji
     extend self
 
-    def emojis
-      Gemojione.index.instance_variable_get(:@emoji_by_name)
-    end
-
-    def emojis_by_moji
-      Gemojione.index.instance_variable_get(:@emoji_by_moji)
-    end
-
-    def emojis_unicodes
-      emojis_by_moji.keys
-    end
-
-    def emojis_names
-      emojis.keys
-    end
-
-    def emojis_aliases
-      @emoji_aliases ||= Gitlab::Json.parse(File.read(Rails.root.join('fixtures', 'emojis', 'aliases.json')))
-    end
-
-    def emoji_filename(name)
-      emojis[name]["unicode"]
-    end
-
-    def emoji_unicode_filename(moji)
-      emojis_by_moji[moji]["unicode"]
-    end
-
-    def emoji_unicode_version(name)
-      emoji_unicode_versions_by_name[name]
-    end
+    # When updating emoji assets increase the version below
+    # and update the version number in `app/assets/javascripts/emoji/index.js`
+    EMOJI_VERSION = 1
 
-    def normalize_emoji_name(name)
-      emojis_aliases[name] || name
+    # Return a Pathname to emoji's current versioned folder
+    #
+    # @return [Pathname] Absolute Path to versioned emojis folder in `public`
+    def emoji_public_absolute_path
+      Rails.root.join("public/-/emojis/#{EMOJI_VERSION}")
     end
 
     def emoji_image_tag(name, src)
@@ -54,23 +29,19 @@ module Gitlab
       ActionController::Base.helpers.tag(:img, image_options)
     end
 
-    def emoji_exists?(name)
-      emojis.has_key?(name)
-    end
-
     # CSS sprite fallback takes precedence over image fallback
-    def gl_emoji_tag(name, options = {})
-      emoji_name = emojis_aliases[name] || name
-      emoji_info = emojis[emoji_name]
-      return unless emoji_info
+    # @param [TanukiEmoji::Character] emoji
+    # @param [Hash] options
+    def gl_emoji_tag(emoji, options = {})
+      return unless emoji
 
       data = {
-        name: emoji_name,
-        unicode_version: emoji_unicode_version(emoji_name)
+        name: emoji.name,
+        unicode_version: emoji.unicode_version
       }
-      options = { title: emoji_info['description'], data: data }.merge(options)
+      options = { title: emoji.description, data: data }.merge(options)
 
-      ActionController::Base.helpers.content_tag('gl-emoji', emoji_info['moji'], options)
+      ActionController::Base.helpers.content_tag('gl-emoji', emoji.codepoints, options)
     end
 
     def custom_emoji_tag(name, image_source)
@@ -82,12 +53,5 @@ module Gitlab
         emoji_image_tag(name, image_source).html_safe
       end
     end
-
-    private
-
-    def emoji_unicode_versions_by_name
-      @emoji_unicode_versions_by_name ||=
-        Gitlab::Json.parse(File.read(Rails.root.join('fixtures', 'emojis', 'emoji-unicode-version-map.json')))
-    end
   end
 end