Commit aaa154be authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'sh-downgrade-emoji-version' into 'master'

Downgrade EMOJI_VERSION to 1

See merge request gitlab-org/gitlab!72730
parents e780449d eeed341d
...@@ -10,7 +10,7 @@ let validEmojiNames = null; ...@@ -10,7 +10,7 @@ let validEmojiNames = null;
export const FALLBACK_EMOJI_KEY = 'grey_question'; export const FALLBACK_EMOJI_KEY = 'grey_question';
// Keep the version in sync with `lib/gitlab/emoji.rb` // Keep the version in sync with `lib/gitlab/emoji.rb`
export const EMOJI_VERSION = '2'; export const EMOJI_VERSION = '1';
const isLocalStorageAvailable = AccessorUtilities.canUseLocalStorage(); const isLocalStorageAvailable = AccessorUtilities.canUseLocalStorage();
......
...@@ -6,7 +6,7 @@ module Gitlab ...@@ -6,7 +6,7 @@ module Gitlab
# When updating emoji assets increase the version below # When updating emoji assets increase the version below
# and update the version number in `app/assets/javascripts/emoji/index.js` # and update the version number in `app/assets/javascripts/emoji/index.js`
EMOJI_VERSION = 2 EMOJI_VERSION = 1
# Return a Pathname to emoji's current versioned folder # Return a Pathname to emoji's current versioned folder
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment