summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAlexander Popov <alex.wayfer@gmail.com>2018-05-18 15:20:23 +0300
committerAlexander Popov <alex.wayfer@gmail.com>2018-08-13 21:11:40 +0300
commitf73a21e35710eef24b47307631f1996b35fdf9d3 (patch)
treec1ab5bc12ffc84b5bca9db8991d593316732eb11 /doc
parent891cb10fc9ca4ee915eecdefb2c903705fefaa64 (diff)
downloadgitlab-ce-f73a21e35710eef24b47307631f1996b35fdf9d3.tar.gz
Add Noto Color Emoji font support
This is a font from [Google](https://www.google.com/get/noto/). Arch Linux [has a recommendation of it](https://wiki.archlinux.org/index.php/fonts#Emoji_and_symbols). Add info about this into `docs/user/markdown.md#emoji`
Diffstat (limited to 'doc')
-rw-r--r--doc/user/markdown.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index bd199b55a61..ea6acecc387 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -234,6 +234,8 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/user/markdown.md#emoji
Consult the [Emoji Cheat Sheet](https://www.emojicopy.com) for a list of all supported emoji codes. :thumbsup:
+ Most emoji are natively supported on macOS, Windows, iOS, Android and will fallback to image-based emoji where there is lack of support. On Linux, you can download [Noto Color Emoji](https://www.google.com/get/noto/help/emoji/) to get full native emoji support.
+
Sometimes you want to :monkey: around a bit and add some :star2: to your :speech_balloon:. Well we have a gift for you:
:zap: You can use emoji anywhere GFM is supported. :v:
@@ -244,6 +246,8 @@ If you are new to this, don't be :fearful:. You can easily join the emoji :famil
Consult the [Emoji Cheat Sheet](https://www.emojicopy.com) for a list of all supported emoji codes. :thumbsup:
+Most emoji are natively supported on macOS, Windows, iOS, Android and will fallback to image-based emoji where there is lack of support. On Linux, you can download [Noto Color Emoji](https://www.google.com/get/noto/help/emoji/) to get full native emoji support.
+
### Special GitLab References
GFM recognizes special references.