summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-02-21 15:47:01 +0000
committerRémy Coutable <remy@rymai.me>2018-02-21 15:47:01 +0000
commitb5372d822e208b55c54f6a49976d90e026034539 (patch)
tree3af678ff82b98a808c49588a5972396074aa198d
parent062f487c1ea17f84fb9e022b574cc6ee0492d6b1 (diff)
parent835e0227d8b04dd60a03aa7d089f3f4401f819f7 (diff)
downloadgitlab-ce-b5372d822e208b55c54f6a49976d90e026034539.tar.gz
Merge branch 'patch-28' into 'master'
emoji.codes is now emojicopy.com See merge request gitlab-org/gitlab-ce!17212
-rw-r--r--doc/user/markdown.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index b590dfa0d40..ac8ff67f622 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -226,7 +226,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/user/markdown.md#emoji
If you are new to this, don't be :fearful:. You can easily join the emoji :family:. All you need to do is to look up on the supported codes.
- Consult the [Emoji Cheat Sheet](http://emoji.codes) for a list of all supported emoji codes. :thumbsup:
+ Consult the [Emoji Cheat Sheet](https://www.emojicopy.com) for a list of all supported emoji codes. :thumbsup:
Sometimes you want to :monkey: around a bit and add some :star2: to your :speech_balloon:. Well we have a gift for you:
@@ -236,7 +236,7 @@ You can use it to point out a :bug: or warn about :speak_no_evil: patches. And i
If you are new to this, don't be :fearful:. You can easily join the emoji :family:. All you need to do is to look up on the supported codes.
-Consult the [Emoji Cheat Sheet](http://emoji.codes) for a list of all supported emoji codes. :thumbsup:
+Consult the [Emoji Cheat Sheet](https://www.emojicopy.com) for a list of all supported emoji codes. :thumbsup:
### Special GitLab References