summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-03-07 13:12:14 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-03-07 13:12:14 +0000
commitfc65f56399796c2b6698597f5df3d8ea343d1a77 (patch)
treefcbd8500978dc305143db0c474b9e28a82d78067 /changelogs
parent0bae567369e51c9a8590101633adf435066ac18d (diff)
parentaa60db6cee8e285a39077c567c7f59fecbd0e0a3 (diff)
downloadgitlab-ce-fc65f56399796c2b6698597f5df3d8ea343d1a77.tar.gz
Merge branch 'replace_redcarpet_with_cmark' into 'master'
Add CommonMark markdown engine See merge request gitlab-org/gitlab-ce!14835
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/replace_redcarpet_with_cmark.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/replace_redcarpet_with_cmark.yml b/changelogs/unreleased/replace_redcarpet_with_cmark.yml
new file mode 100644
index 00000000000..7ce848b0bbd
--- /dev/null
+++ b/changelogs/unreleased/replace_redcarpet_with_cmark.yml
@@ -0,0 +1,5 @@
+---
+title: Add CommonMark markdown engine (experimental)
+merge_request: 14835
+author: blackst0ne
+type: added