diff options
| author | Mike Lewis <mlewis@gitlab.com> | 2019-01-13 21:45:34 +0000 |
|---|---|---|
| committer | Mike Lewis <mlewis@gitlab.com> | 2019-01-13 21:45:34 +0000 |
| commit | 1e7fefef81bee1c8f8cf6e287540e9b0e547a0a8 (patch) | |
| tree | 604c0af13c381e0323e5d5f48ded63199922482e | |
| parent | 1161c99e5c5a6e717127b83665de00068d810e0e (diff) | |
| parent | b1df1a1759f71bb1d5d0655ebf9d169e0676c992 (diff) | |
| download | gitlab-ce-1e7fefef81bee1c8f8cf6e287540e9b0e547a0a8.tar.gz | |
Merge branch 'patch-37' into 'master'
docs: emoji cheat sheet with shortcodes
Closes #42672
See merge request gitlab-org/gitlab-ce!24320
| -rw-r--r-- | doc/user/markdown.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/markdown.md b/doc/user/markdown.md index 893658290e5..f2448f240ca 100644 --- a/doc/user/markdown.md +++ b/doc/user/markdown.md @@ -300,7 +300,7 @@ You can use it to point out a <img src="https://gitlab.com/gitlab-org/gitlab-ce/ If you are new to this, don't be <img src="https://gitlab.com/gitlab-org/gitlab-ce/raw/master/app/assets/images/emoji/fearful.png" width="20px" height="20px">. You can easily join the emoji <img src="https://gitlab.com/gitlab-org/gitlab-ce/raw/master/app/assets/images/emoji/family.png" width="20px" height="20px">. All you need to do is to look up one of the supported codes. -Consult the [Emoji Cheat Sheet](https://www.emojicopy.com) for a list of all supported emoji codes. <img src="https://gitlab.com/gitlab-org/gitlab-ce/raw/master/app/assets/images/emoji/thumbsup.png" width="20px" height="20px"> +Consult the [Emoji Cheat Sheet](https://www.webfx.com/tools/emoji-cheat-sheet/) for a list of all supported emoji codes. <img src="https://gitlab.com/gitlab-org/gitlab-ce/raw/master/app/assets/images/emoji/thumbsup.png" width="20px" height="20px"> Most emoji are natively supported on macOS, Windows, iOS, Android and will fallback to image-based emoji where there is lack of support. |