diff options
| author | Horacio Sanson <horacio@allm.net> | 2016-11-29 02:41:29 +0900 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-01-12 10:04:52 +0000 |
| commit | f986b4c4e529f4c2518f0ce37dc9dfcaa2f073a0 (patch) | |
| tree | 13e60d8ed5cb64be9399516882e8d8e73efffbc8 /lib/gitlab/current_settings.rb | |
| parent | 826adaaff876d2b6b5886e6d8133b0d0c2cd4a2d (diff) | |
| download | gitlab-ce-f986b4c4e529f4c2518f0ce37dc9dfcaa2f073a0.tar.gz | |
Add support for PlantUML diagrams in Asciidoc.
This MR enables rendering of PlantUML diagrams in Asciidoc documents. To add a
PlantUML diagram all we need is to include a plantuml block like:
```
[plantuml, id="myDiagram", width="100px", height="100px"]
--
bob -> alice : ping
alice -> bob : pong
--
```
The plantuml block is substituted by an HTML img element with *src* pointing to
an external PlantUML server.
This MR also add a PlantUML integration section to the Administrator -> Settings
page to configure the PlantUML rendering service and to enable/disable it.
Closes: #17603
Diffstat (limited to 'lib/gitlab/current_settings.rb')
| -rw-r--r-- | lib/gitlab/current_settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 9d142f1b82e..2ff27e46d64 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -35,6 +35,7 @@ module Gitlab signin_enabled: Settings.gitlab['signin_enabled'], gravatar_enabled: Settings.gravatar['enabled'], koding_enabled: false, + plantuml_enabled: false, sign_in_text: nil, after_sign_up_text: nil, help_page_text: nil, |