summaryrefslogtreecommitdiff
path: root/doc/integration/README.md
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 /doc/integration/README.md
parente798ee718312dbe7445ec9cf2e75045e8b2b3117 (diff)
parentf986b4c4e529f4c2518f0ce37dc9dfcaa2f073a0 (diff)
downloadgitlab-ce-20450-retry-build-button.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 'doc/integration/README.md')
-rw-r--r--doc/integration/README.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/integration/README.md b/doc/integration/README.md
index ed843c0bfa9..e97430feb57 100644
--- a/doc/integration/README.md
+++ b/doc/integration/README.md
@@ -16,6 +16,7 @@ See the documentation below for details on how to configure these services.
- [reCAPTCHA](recaptcha.md) Configure GitLab to use Google reCAPTCHA for new users
- [Akismet](akismet.md) Configure Akismet to stop spam
- [Koding](../administration/integration/koding.md) Configure Koding to use IDE integration
+- [PlantUML](../administration/integration/plantuml.md) Configure PlantUML to use diagrams in AsciiDoc documents.
GitLab Enterprise Edition contains [advanced Jenkins support][jenkins].