Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7db81dd6
Commit
7db81dd6
authored
Jul 06, 2020
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply 1 suggestion(s) to 1 file(s)
parent
88060a63
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
app/assets/javascripts/emoji/index.js
app/assets/javascripts/emoji/index.js
+3
-2
No files found.
app/assets/javascripts/emoji/index.js
View file @
7db81dd6
...
...
@@ -21,8 +21,9 @@ export function initEmojiMap() {
validEmojiNames
=
[...
Object
.
keys
(
emojiMap
),
...
Object
.
keys
(
emojiAliases
)];
resolve
(
emojiMap
);
}
else
{
// We load the JSON from server
// Can't be loaded from CDN due to cross domain problems with JSON files
// We load the JSON file direct from the server
// because it can't be loaded from a CDN due to
// cross domain problems with JSON
axios
.
get
(
`
${
gon
.
relative_url_root
||
''
}
/-/emojis/
${
EMOJI_VERSION
}
/emojis.json`
)
.
then
(({
data
})
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment