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
ce1a1aa1
Commit
ce1a1aa1
authored
Nov 15, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move
🏳🌈
to flags category
parent
617c4fd9
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
+7
-4
app/assets/javascripts/awards_handler.js
app/assets/javascripts/awards_handler.js
+0
-1
app/assets/javascripts/emoji/index.js
app/assets/javascripts/emoji/index.js
+0
-1
fixtures/emojis/digests.json
fixtures/emojis/digests.json
+1
-1
lib/tasks/gemojione.rake
lib/tasks/gemojione.rake
+6
-1
No files found.
app/assets/javascripts/awards_handler.js
View file @
ce1a1aa1
...
...
@@ -22,7 +22,6 @@ const categoryLabelMap = {
objects
:
'
Objects
'
,
symbols
:
'
Symbols
'
,
flags
:
'
Flags
'
,
extras
:
'
Extras
'
,
};
const
IS_VISIBLE
=
'
is-visible
'
;
...
...
app/assets/javascripts/emoji/index.js
View file @
ce1a1aa1
...
...
@@ -33,7 +33,6 @@ export function getEmojiCategoryMap() {
objects
:
[],
symbols
:
[],
flags
:
[],
extras
:
[],
};
Object
.
keys
(
emojiMap
).
forEach
((
name
)
=>
{
const
emoji
=
emojiMap
[
name
];
...
...
fixtures/emojis/digests.json
View file @
ce1a1aa1
...
...
@@ -5376,7 +5376,7 @@
"digest"
:
"180e66f19d9285e02d0a5e859722c608206826e80323942b9938fc49d44973b1"
},
"gay_pride_flag"
:
{
"category"
:
"
extra
s"
,
"category"
:
"
flag
s"
,
"moji"
:
"🏳🌈"
,
"description"
:
"gay_pride_flag"
,
"unicodeVersion"
:
"6.0"
,
...
...
lib/tasks/gemojione.rake
View file @
ce1a1aa1
...
...
@@ -39,8 +39,13 @@ namespace :gemojione do
fpath
=
File
.
join
(
dir
,
"
#{
emoji_hash
[
'unicode'
]
}
.png"
)
hash_digest
=
Digest
::
SHA256
.
file
(
fpath
).
hexdigest
category
=
emoji_hash
[
'category'
]
if
name
==
'gay_pride_flag'
category
=
'flags'
end
entry
=
{
category:
emoji_hash
[
'category'
]
,
category:
category
,
moji:
emoji_hash
[
'moji'
],
description:
emoji_hash
[
'description'
],
unicodeVersion:
Gitlab
::
Emoji
.
emoji_unicode_version
(
name
),
...
...
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