summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2019-03-13 13:27:01 +0100
committerTim Zallmann <tzallmann@gitlab.com>2019-03-13 13:27:01 +0100
commit5a35559ccff528ab4313563dc14733d98a257293 (patch)
treed60c0a5d89360711234e7f3cf1ebb72ffbf36be2
parentcf2b0dc583bb954d17f307177666311a1e650ed4 (diff)
downloadgitlab-ce-tz-load-emojis-json-fromserver.tar.gz
Remove CDN loading for emojis.jsontz-load-emojis-json-fromserver
-rw-r--r--app/assets/javascripts/emoji/index.js5
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)];