Merge pull request #4955 from jjaffeux/remove-cricket-alias

FIX: do not override 🦗 with :cricket_bat_and_ball:

app/assets/javascripts/discourse/lib/emoji/groups.js.es6

@@ -680,7 +680,7 @@ const groups = [
       "tennis",
       "8ball",
       "bowling",
-      "cricket",
+      "cricket_bat_and_ball",
       "field_hockey",
       "ice_hockey",
       "ping_pong",

lib/emoji/db.json

@@ -2198,7 +2198,7 @@
     },
     {
       "code": "1f3cf",
-      "name": "cricket"
+      "name": "cricket_bat_and_ball"
     },
     {
       "code": "1f3bf",
@@ -6194,7 +6194,7 @@
     "crayon": [
       "lower_left_crayon"
     ],
-    "cricket": [
+    "cricket_bat_and_ball": [
       "cricket_bat_ball"
     ],
     "latin_cross": [

lib/tasks/emoji.rake

@@ -28,7 +28,7 @@ EMOJI_ALIASES ||= {
   "city_sunset" => [ "city_dusk" ],
   "couch_and_lamp" => [ "couch" ],
   "crayon" => [ "lower_left_crayon" ],
-  "cricket" => [ "cricket_bat_ball" ],
+  "cricket_bat_and_ball" => [ "cricket_bat_ball" ],
   "latin_cross" => [ "cross" ],
   "dagger" => [ "dagger_knife" ],
   "desktop_computer" => [ "desktop" ],