summaryrefslogtreecommitdiff
path: root/lib/gitlab/emoji.rb
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-03-08 10:12:37 -0600
committerEric Eastwood <contact@ericeastwood.com>2017-03-08 10:41:16 -0600
commit3403bdc5f2aa97331ea1f4766dc08bbcd243f70d (patch)
treeb64f4b39311458011e89736d906be00634dc50b7 /lib/gitlab/emoji.rb
parentd20a6033858c316e20d5c3574c91f12be66fae17 (diff)
downloadgitlab-ce-3403bdc5f2aa97331ea1f4766dc08bbcd243f70d.tar.gz
Fix reference to node_modules in built package
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29192 See https://gitlab.slack.com/archives/frontend/p1488973548024005
Diffstat (limited to 'lib/gitlab/emoji.rb')
-rw-r--r--lib/gitlab/emoji.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/emoji.rb b/lib/gitlab/emoji.rb
index 42703545c4f..35871fd1b7b 100644
--- a/lib/gitlab/emoji.rb
+++ b/lib/gitlab/emoji.rb
@@ -31,7 +31,7 @@ module Gitlab
end
def emoji_unicode_version(name)
- @emoji_unicode_versions_by_name ||= JSON.parse(File.read(Rails.root.join('node_modules', 'emoji-unicode-version', 'emoji-unicode-version-map.json')))
+ @emoji_unicode_versions_by_name ||= JSON.parse(File.read(Rails.root.join('fixtures', 'emojis', 'emoji-unicode-version-map.json')))
@emoji_unicode_versions_by_name[name]
end