Sort emoji categories21443-reorder-emoji-following-standard-order

1 files changed, 17 insertions, 3 deletions

diff --git a/lib/gitlab/award_emoji.rb b/lib/gitlab/award_emoji.rb
index 39b43ab5489..43562a9a216 100644
--- a/lib/gitlab/award_emoji.rb
+++ b/lib/gitlab/award_emoji.rb
@@ -29,11 +29,9 @@ module Gitlab
 
           @emoji_by_category[category] << data
         end
-
-        @emoji_by_category = @emoji_by_category.sort.to_h
       end
 
-      @emoji_by_category
+      @emoji_by_category = sort_emoji_by_category
     end
 
     def self.emojis
@@ -52,6 +50,22 @@ module Gitlab
         end
     end
 
+    def self.sort_emoji_by_category
+      sorted_emoji_by_category = {}
+      [
+        'people',
+        'nature',
+        'travel',
+        'activity',
+        'objects',
+        'symbols',
+        'flags'
+      ].each do |category|
+        sorted_emoji_by_category[category] = @emoji_by_category[category]
+      end
+      sorted_emoji_by_category
+    end
+
     # Returns an Array of Emoji names and their asset URLs.
     def self.urls
       @urls ||= begin