summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/awards_handler.js1
-rw-r--r--app/assets/javascripts/emoji/index.js1
-rw-r--r--fixtures/emojis/digests.json2
-rw-r--r--lib/tasks/gemojione.rake7
4 files changed, 7 insertions, 4 deletions
diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index 6a3a8068eae..622764107ad 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -22,7 +22,6 @@ const categoryLabelMap = {
objects: 'Objects',
symbols: 'Symbols',
flags: 'Flags',
- extras: 'Extras',
};
const IS_VISIBLE = 'is-visible';
diff --git a/app/assets/javascripts/emoji/index.js b/app/assets/javascripts/emoji/index.js
index 7ce23b57d69..dc7672560ea 100644
--- a/app/assets/javascripts/emoji/index.js
+++ b/app/assets/javascripts/emoji/index.js
@@ -33,7 +33,6 @@ export function getEmojiCategoryMap() {
objects: [],
symbols: [],
flags: [],
- extras: [],
};
Object.keys(emojiMap).forEach((name) => {
const emoji = emojiMap[name];
diff --git a/fixtures/emojis/digests.json b/fixtures/emojis/digests.json
index 84c84748889..3c8f6426f93 100644
--- a/fixtures/emojis/digests.json
+++ b/fixtures/emojis/digests.json
@@ -5376,7 +5376,7 @@
"digest": "180e66f19d9285e02d0a5e859722c608206826e80323942b9938fc49d44973b1"
},
"gay_pride_flag": {
- "category": "extras",
+ "category": "flags",
"moji": "🏳🌈",
"description": "gay_pride_flag",
"unicodeVersion": "6.0",
diff --git a/lib/tasks/gemojione.rake b/lib/tasks/gemojione.rake
index 7a814da36bc..c2d3a6b6950 100644
--- a/lib/tasks/gemojione.rake
+++ b/lib/tasks/gemojione.rake
@@ -39,8 +39,13 @@ namespace :gemojione do
fpath = File.join(dir, "#{emoji_hash['unicode']}.png")
hash_digest = Digest::SHA256.file(fpath).hexdigest
+ category = emoji_hash['category']
+ if name == 'gay_pride_flag'
+ category = 'flags'
+ end
+
entry = {
- category: emoji_hash['category'],
+ category: category,
moji: emoji_hash['moji'],
description: emoji_hash['description'],
unicodeVersion: Gitlab::Emoji.emoji_unicode_version(name),