summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <marcia@gitlab.com>2019-06-11 16:14:01 +0000
committerMarcia Ramos <marcia@gitlab.com>2019-06-11 16:14:01 +0000
commite0aabd52753438b39dfd8461dce07e53ccf14144 (patch)
tree9d81ed02ce66524a94c40235b592b1d38579b38e
parent8863e0c7493015c944f5c290716b5250e3cbaa3f (diff)
parentbb3280f1cb0daaf6386cdac45be35dd3c1c29717 (diff)
downloadgitlab-ce-e0aabd52753438b39dfd8461dce07e53ccf14144.tar.gz
Merge branch '62813-show-inline-diff-example-rendered' into 'master'
Show inline diff example rendered Closes #62813 See merge request gitlab-org/gitlab-ce!29239
-rw-r--r--doc/user/img/markdown_inline_diffs_tags_rendered.pngbin0 -> 1804 bytes
-rw-r--r--doc/user/markdown.md6
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/user/img/markdown_inline_diffs_tags_rendered.png b/doc/user/img/markdown_inline_diffs_tags_rendered.png
new file mode 100644
index 00000000000..4279a20b5a0
--- /dev/null
+++ b/doc/user/img/markdown_inline_diffs_tags_rendered.png
Binary files differ
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index 6b6e5ab7634..31c8093ced7 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -246,7 +246,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/user/markdown.md#inline-
With inline diffs tags you can display {+ additions +} or [- deletions -].
-The wrapping tags can be either curly braces or square brackets: [+ additions +] or {- deletions -}.
+The wrapping tags can be either curly braces or square brackets.
Examples:
@@ -257,6 +257,10 @@ Examples:
- [- deletions -]
```
+becomes:
+
+![inline diffs tags rendered](img/markdown_inline_diffs_tags_rendered.png)
+
However the wrapping tags cannot be mixed as such:
```