BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
3403bdc5
Commit
3403bdc5
authored
Mar 08, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
parent
d20a6033
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
emoji-unicode-version-map.json
fixtures/emojis/emoji-unicode-version-map.json
+0
-0
emoji.rb
lib/gitlab/emoji.rb
+1
-1
gemojione.rake
lib/tasks/gemojione.rake
+4
-1
No files found.
fixtures/emojis/emoji-unicode-version-map.json
0 → 100644
View file @
3403bdc5
This diff is collapsed.
Click to expand it.
lib/gitlab/emoji.rb
View file @
3403bdc5
...
@@ -31,7 +31,7 @@ module Gitlab
...
@@ -31,7 +31,7 @@ module Gitlab
end
end
def
emoji_unicode_version
(
name
)
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
]
@emoji_unicode_versions_by_name
[
name
]
end
end
...
...
lib/tasks/gemojione.rake
View file @
3403bdc5
namespace
:gemojione
do
namespace
:gemojione
do
desc
'Generates Emoji SHA256 digests'
desc
'Generates Emoji SHA256 digests'
task
digests:
:environment
do
task
digests:
[
'yarn:check'
,
'environment'
]
do
require
'digest/sha2'
require
'digest/sha2'
require
'json'
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
dir
=
Gemojione
.
images_path
resultant_emoji_map
=
{}
resultant_emoji_map
=
{}
...
...
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