Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'

# Conflicts:
#	app/services/system_note_service.rb

1 files changed, 13 insertions, 0 deletions

diff --git a/spec/fixtures/markdown.md.erb b/spec/fixtures/markdown.md.erb
index 3e777a5e92b..34ce7c4f033 100644
--- a/spec/fixtures/markdown.md.erb
+++ b/spec/fixtures/markdown.md.erb
@@ -243,3 +243,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 -}