Commit d5fa495b authored by Filipa Lacerda's avatar Filipa Lacerda Committed by John Jarvis

Merge branch 'tz-load-emojis-from-server-not-cdn' into 'master'

Removes the CDN loading for emojis.json

See merge request gitlab-org/gitlab-ce!26102
parent 2d4c1c46
......@@ -33,10 +33,7 @@ export function initEmojiMap() {
}
axiosInstance
.get(
`${gon.asset_host || ''}${gon.relative_url_root ||
''}/-/emojis/${EMOJI_VERSION}/emojis.json`,
)
.get(`${gon.relative_url_root || ''}/-/emojis/${EMOJI_VERSION}/emojis.json`)
.then(({ data }) => {
emojiMap = data;
validEmojiNames = [...Object.keys(emojiMap), ...Object.keys(emojiAliases)];
......
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