Merge branch '29192-fix-emoji-node-modules-reference-for-unicode-versions' into 'master'

Fix reference to node_modules for emoji unicode versions

Closes #29192

See merge request !9810
This commit is contained in:
Douwe Maan 2017-03-08 18:14:44 +00:00
commit 8707db80d6
3 changed files with 2382 additions and 2 deletions

File diff suppressed because it is too large Load Diff

View File

@ -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

View File

@ -1,9 +1,12 @@
namespace :gemojione do
desc 'Generates Emoji SHA256 digests'
task digests: :environment do
task digests: ['yarn:check', 'environment'] do
require 'digest/sha2'
require 'json'
# We don't have `node_modules` available in built versions of GitLab
FileUtils.cp_r(Rails.root.join('node_modules', 'emoji-unicode-version', 'emoji-unicode-version-map.json'), File.join(Rails.root, 'fixtures', 'emojis'))
dir = Gemojione.images_path
resultant_emoji_map = {}