diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-04-20 13:38:23 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-04-20 13:38:23 +0100 |
commit | 3a7982464b613276d10f2a74c3b08aa07c8e63c2 (patch) | |
tree | 6362c25a0b8ee7b8a9ae84ad15cbb032a4df1bd2 /doc/administration | |
parent | c2e26dc0e61541ff8f68c19931a662bcd2178d3e (diff) | |
parent | f99cc765c7cc20372e2c1c915c40e4a71a1dca15 (diff) | |
download | gitlab-ce-doc-js-side-effetcs.tar.gz |
Merge branch 'master' into doc-js-side-effetcsdoc-js-side-effetcs
* master:
Refactor into .vue files
Adds vue js example application and documentation
Add ES lint support to identify poorly written Promises
Update plantuml.md to add the actual link.
Fixed wording
Fix headings
Add more information in the User cohort documentation
Add CHANGELOG
Port of fix/29125-ee to CE
Do not append issuable state to links with custom anchor
Update plantuml.md to fix wrong introduced in link.
Diffstat (limited to 'doc/administration')
-rw-r--r-- | doc/administration/integration/plantuml.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/administration/integration/plantuml.md b/doc/administration/integration/plantuml.md index 6515b1a264a..5c856835039 100644 --- a/doc/administration/integration/plantuml.md +++ b/doc/administration/integration/plantuml.md @@ -1,6 +1,6 @@ # PlantUML & GitLab -> [Introduced][ce-7810] in GitLab 8.16. +> [Introduced][ce-8537] in GitLab 8.16. When [PlantUML](http://plantuml.com) integration is enabled and configured in GitLab we are able to create simple diagrams in AsciiDoc and Markdown documents @@ -93,3 +93,5 @@ Some parameters can be added to the AsciiDoc block definition: - *height*: Height attribute added to the img tag. Markdown does not support any parameters and will always use PNG format. + +[ce-8537]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8537
\ No newline at end of file |