diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-03-13 16:36:14 +0300 |
|---|---|---|
| committer | John Jarvis <jarv@gitlab.com> | 2019-03-13 16:38:25 +0300 |
| commit | d5fa495b8b3f0f9aed4af43987b17a80c8e3e5e6 (patch) | |
| tree | 30fe3053fb56014bd0b4c2f484c1fb2f6d13eee7 /app | |
| parent | 2d4c1c46b5a8ad6f310362792b8aeb7a639390af (diff) | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/emoji/index.js | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/javascripts/emoji/index.js b/app/assets/javascripts/emoji/index.js index bb5085a1911..b9b3b344524 100644 --- a/app/assets/javascripts/emoji/index.js +++ b/app/assets/javascripts/emoji/index.js @@ -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)]; |