summaryrefslogtreecommitdiff
path: root/changelogs/unreleased/asciidoctor-plantuml.yml
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-01-19 15:31:04 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2017-01-19 15:31:04 +0100
commit8171a1932b3c5e55ad3ea8402ac68ff14692ca32 (patch)
treecdcef619d3df923e634bd61228179d80e88c61f6 /changelogs/unreleased/asciidoctor-plantuml.yml
parent8c9a4ed373f4b517aeae669e64023dc52c8d704a (diff)
parent1cc6d206b5d4cf09bb502a254703f3a2de2dbeb7 (diff)
downloadgitlab-ce-8171a1932b3c5e55ad3ea8402ac68ff14692ca32.tar.gz
Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-build
Diffstat (limited to 'changelogs/unreleased/asciidoctor-plantuml.yml')
-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