Merge branch 'brodock/upgrade-emoji-version-2' into 'master'

Tanuki Emoji: switch fallback emoji to Noto Emoji

See merge request gitlab-org/gitlab!76479

app/assets/javascripts/emoji/index.js

@@ -10,7 +10,7 @@ let validEmojiNames = null;
 export const FALLBACK_EMOJI_KEY = 'grey_question';
 
 // Keep the version in sync with `lib/gitlab/emoji.rb`
-export const EMOJI_VERSION = '1';
+export const EMOJI_VERSION = '2';
 
 const isLocalStorageAvailable = AccessorUtilities.canUseLocalStorage();
 

lib/gitlab/emoji.rb

@@ -6,7 +6,7 @@ module Gitlab
 
     # When updating emoji assets increase the version below
     # and update the version number in `app/assets/javascripts/emoji/index.js`
-    EMOJI_VERSION = 1
+    EMOJI_VERSION = 2
 
     # Return a Pathname to emoji's current versioned folder
     #