summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-04-27 11:02:27 +0100
committerSean McGivern <sean@gitlab.com>2017-04-27 11:02:27 +0100
commit2df748aa71d6c636c82ed2a0a8dde8ebf6bfc7f2 (patch)
treeaae6ce8fac0775b15b65ce26afb3f700de030948 /changelogs
parent4bdbcf594812d35bab3c2b597fc8087f840bbd4d (diff)
parent31c990cc41e2dc7576cf867a313862a07fd8c170 (diff)
downloadgitlab-ce-2df748aa71d6c636c82ed2a0a8dde8ebf6bfc7f2.tar.gz
Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser'
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/fix_emoji_parser.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/fix_emoji_parser.yml b/changelogs/unreleased/fix_emoji_parser.yml
new file mode 100644
index 00000000000..2b1fffe2457
--- /dev/null
+++ b/changelogs/unreleased/fix_emoji_parser.yml
@@ -0,0 +1,4 @@
+---
+title: Fix rendering emoji inside a string
+merge_request: 10647
+author: blackst0ne