diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:11:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:11:53 +0300 |
commit | 889bf7a0eea1f4ac7c2ec28cdfded399c0ca8fb9 (patch) | |
tree | bc2f4d2b049c6bcf4d57cef67c43599c8a6ec888 /app/assets/javascripts/emoji | |
parent | dad48b4af20204db430a6c62c4641283e24dd89a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/emoji')
-rw-r--r-- | app/assets/javascripts/emoji/constants.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/emoji/index.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/emoji/support/unicode_support_map.js | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/emoji/constants.js b/app/assets/javascripts/emoji/constants.js index e9f2272e759..2efbd1357f7 100644 --- a/app/assets/javascripts/emoji/constants.js +++ b/app/assets/javascripts/emoji/constants.js @@ -3,10 +3,10 @@ export const FREQUENTLY_USED_COOKIE_KEY = 'frequently_used_emojis'; export const CATEGORY_ICON_MAP = { [FREQUENTLY_USED_KEY]: 'history', - activity: 'dumbbell', people: 'smiley', nature: 'nature', food: 'food', + activity: 'dumbbell', travel: 'car', objects: 'object', symbols: 'heart', diff --git a/app/assets/javascripts/emoji/index.js b/app/assets/javascripts/emoji/index.js index d3b658a4020..03eb7abd513 100644 --- a/app/assets/javascripts/emoji/index.js +++ b/app/assets/javascripts/emoji/index.js @@ -8,7 +8,7 @@ let emojiMap = null; let validEmojiNames = null; export const FALLBACK_EMOJI_KEY = 'grey_question'; -export const EMOJI_VERSION = '1'; +export const EMOJI_VERSION = '2'; const isLocalStorageAvailable = AccessorUtilities.isLocalStorageAccessSafe(); diff --git a/app/assets/javascripts/emoji/support/unicode_support_map.js b/app/assets/javascripts/emoji/support/unicode_support_map.js index fe3bc75f9fd..c97fc831ce4 100644 --- a/app/assets/javascripts/emoji/support/unicode_support_map.js +++ b/app/assets/javascripts/emoji/support/unicode_support_map.js @@ -1,6 +1,6 @@ import AccessorUtilities from '../../lib/utils/accessor'; -const GL_EMOJI_VERSION = '0.2.0'; +const GL_EMOJI_VERSION = '0.3.0'; const unicodeSupportTestMap = { // man, student (emojione does not have any of these yet), http://emojipedia.org/emoji-zwj-sequences/ @@ -25,6 +25,8 @@ const unicodeSupportTestMap = { // angel_tone5 '\u{1F47C}\u{1F3FF}', ], + // star_struck, http://emojipedia.org/unicode-9.0/ + '10.0': '\u{1F929}', // rofl, http://emojipedia.org/unicode-9.0/ '9.0': '\u{1F923}', // metal, http://emojipedia.org/unicode-8.0/ |