kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'clearer-documentation-on-inline-diffs' into 'master'

Browse source 
clearer-documentation-on-inline-diffs

See merge request gitlab-org/gitlab-ce!15938
This commit is contained in:
Achilleas Pipinellis 2017-12-14 18:14:24 +00:00
commit 2c3e6f42cf
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doc/user/markdown.md
View file

@ -195,12 +195,23 @@ 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 [+ additions +] or {- deletions -}.
Examples:
```
- {+ additions +}
- [+ additions +]
- {- deletions -}
- [- deletions -]
```
However the wrapping tags cannot be mixed as such: However the wrapping tags cannot be mixed as such:
```
- {+ additions +] - {+ additions +]
- [+ additions +} - [+ additions +}
- {- deletions -] - {- deletions -]
- [- deletions -} - [- deletions -}
```
### Emoji ### Emoji

17
spec/fixtures/markdown.md.erb vendored
View file

@ -258,12 +258,23 @@ 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 [+ additions +] or {- deletions -}.
However the wrapping tags can not be mixed as such - Examples:
```
- {+ additions +}
- [+ additions +]
- {- deletions -}
- [- deletions -]
```
However the wrapping tags cannot be mixed as such:
```
- {+ additions +] - {+ additions +]
- [+ additions +} - [+ additions +}
- {- delletions -] - {- deletions -]
- [- delletions -} - [- deletions -}
```
### Videos ### Videos