From 8a8b5497c5142f225fb4fa3f5441526a0652869a Mon Sep 17 00:00:00 2001 From: Adam Butler Date: Wed, 6 Apr 2016 20:37:09 +0100 Subject: Create DiffFilter and change SystemNoteService#change_title to use Gitlab::Diff::InlineDiff --- spec/fixtures/markdown.md.erb | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'spec/fixtures') 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 -} -- cgit v1.2.1