@@ -90,7 +90,7 @@ It makes use of [new markdown features](#new-GFM-markdown-extensions),
...
@@ -90,7 +90,7 @@ It makes use of [new markdown features](#new-GFM-markdown-extensions),
not found in standard markdown:
not found in standard markdown:
-[Color "chips" written in HEX, RGB or HSL](#colors)
-[Color "chips" written in HEX, RGB or HSL](#colors)
-[Diagrams and flowcharts using Mermaid](#diagrams-and-flowcharts-using-mermaid)
-[Diagrams and flowcharts](#diagrams-and-flowcharts)
-[Emoji](#emoji)
-[Emoji](#emoji)
-[Front matter](#front-matter)
-[Front matter](#front-matter)
-[Inline diffs](#inline-diff)
-[Inline diffs](#inline-diff)
...
@@ -151,13 +151,16 @@ Color written inside backticks will be followed by a color "chip":
...
@@ -151,13 +151,16 @@ Color written inside backticks will be followed by a color "chip":
`HSL(540,70%,50%)`
`HSL(540,70%,50%)`
`HSLA(540,70%,50%,0.3)`
`HSLA(540,70%,50%,0.3)`
### Diagrams and flowcharts using Mermaid
### Diagrams and flowcharts
It is possible to generate diagrams and flowcharts from text in GitLab using [Mermaid](https://mermaidjs.github.io/) or [PlantUML](http://plantuml.com).
#### Mermaid
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/15107) in
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/15107) in
GitLab 10.3.
GitLab 10.3.
It is possible to generate diagrams and flowcharts from text using [Mermaid](https://mermaidjs.github.io/).
Visit the [official page](https://mermaidjs.github.io/) for more details.
Visit the official page for more details.
In order to generate a diagram or flowchart, you should write your text inside the `mermaid` block:
In order to generate a diagram or flowchart, you should write your text inside the `mermaid` block:
...
@@ -179,8 +182,6 @@ graph TD;
...
@@ -179,8 +182,6 @@ graph TD;
C-->D;
C-->D;
```
```
#### Subgraphs
Subgraphs can also be included:
Subgraphs can also be included:
~~~
~~~
...
@@ -219,6 +220,10 @@ graph TB
...
@@ -219,6 +220,10 @@ graph TB
end
end
```
```
#### PlantUML
To make PlantUML available in GitLab, a GitLab administrator needs to enable it first. Read more in [PlantUML & GitLab](../administration/integration/plantuml.md).
### Emoji
### Emoji
> If this is not rendered correctly, [view it in GitLab itself](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/user/markdown.md#emoji).
> If this is not rendered correctly, [view it in GitLab itself](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/user/markdown.md#emoji).