summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-01-12 11:18:42 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-01-12 11:18:42 +0000
commit50fff719fc148ac9f6f6a309770c6136a3aeb31b (patch)
tree41b5b02207d66ef079b7b242b046822211c990d9 /changelogs
parente798ee718312dbe7445ec9cf2e75045e8b2b3117 (diff)
parentf986b4c4e529f4c2518f0ce37dc9dfcaa2f073a0 (diff)
downloadgitlab-ce-50fff719fc148ac9f6f6a309770c6136a3aeb31b.tar.gz
Merge branch 'Sanson/gitlab-ce-asciidoctor-plantuml' into 'master' 20450-retry-build-button
Add support for PlantUML diagrams in Asciidoc. Closes #17603 See merge request !8537
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/asciidoctor-plantuml.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/asciidoctor-plantuml.yml b/changelogs/unreleased/asciidoctor-plantuml.yml
new file mode 100644
index 00000000000..ba6ef7c0800
--- /dev/null
+++ b/changelogs/unreleased/asciidoctor-plantuml.yml
@@ -0,0 +1,4 @@
+---
+title: Add support for PlantUML diagrams in AsciiDoc documents.
+merge_request: 7810
+author: Horacio Sanson