Commit 266b4328 authored by Filipa Lacerda's avatar Filipa Lacerda

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
parents d8bbd3e7 59f26cea
...@@ -33,10 +33,7 @@ export function initEmojiMap() { ...@@ -33,10 +33,7 @@ export function initEmojiMap() {
} }
axiosInstance axiosInstance
.get( .get(`${gon.relative_url_root || ''}/-/emojis/${EMOJI_VERSION}/emojis.json`)
`${gon.asset_host || ''}${gon.relative_url_root ||
''}/-/emojis/${EMOJI_VERSION}/emojis.json`,
)
.then(({ data }) => { .then(({ data }) => {
emojiMap = data; emojiMap = data;
validEmojiNames = [...Object.keys(emojiMap), ...Object.keys(emojiAliases)]; 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