diff options
author | Adam Butler <adam@littlebigmedia.co.uk> | 2016-04-06 20:37:09 +0100 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-05-18 11:15:10 -0500 |
commit | 8a8b5497c5142f225fb4fa3f5441526a0652869a (patch) | |
tree | d93b1a519d0454139e4cc1c51150d51ccd7af8d8 /spec/fixtures | |
parent | 636b3ebb011d7bc58c70a642c7b6920ab99c0b6d (diff) | |
download | gitlab-ce-8a8b5497c5142f225fb4fa3f5441526a0652869a.tar.gz |
Create DiffFilter and change SystemNoteService#change_title to use Gitlab::Diff::InlineDiff
Diffstat (limited to 'spec/fixtures')
-rw-r--r-- | spec/fixtures/markdown.md.erb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/spec/fixtures/markdown.md.erb b/spec/fixtures/markdown.md.erb index 1772cc3f6a4..92c7fdf27bd 100644 --- a/spec/fixtures/markdown.md.erb +++ b/spec/fixtures/markdown.md.erb @@ -239,3 +239,16 @@ References should be parseable even inside _<%= merge_request.to_reference %>_ e - [[link-text|http://example.com/pdfs/gollum.pdf]] - [[images/example.jpg]] - [[http://example.com/images/example.jpg]] + +### Inline Diffs + +With inline diffs tags you can display {+ 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 - + +- {+ additions +] +- [+ additions +} +- {- delletions -] +- [- delletions -} |