summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-03-13 13:36:14 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-03-13 13:36:14 +0000
commit266b432894652f552d4a51bb6e7b807538aff0df (patch)
tree0083db172a4e0fadaeadd5883cccbcdcce1f68c6
parentd8bbd3e78e2fe21048bf4c3ad58fd815c8339200 (diff)
parent59f26ceacd9d94608df60409bd65b1bfe431d6f8 (diff)
downloadgitlab-ce-266b432894652f552d4a51bb6e7b807538aff0df.tar.gz
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
-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)];