summaryrefslogtreecommitdiff
path: root/spec/fixtures
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-04-27 11:02:27 +0100
committerSean McGivern <sean@gitlab.com>2017-04-27 11:02:27 +0100
commit2df748aa71d6c636c82ed2a0a8dde8ebf6bfc7f2 (patch)
treeaae6ce8fac0775b15b65ce26afb3f700de030948 /spec/fixtures
parent4bdbcf594812d35bab3c2b597fc8087f840bbd4d (diff)
parent31c990cc41e2dc7576cf867a313862a07fd8c170 (diff)
downloadgitlab-ce-2df748aa71d6c636c82ed2a0a8dde8ebf6bfc7f2.tar.gz
Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser'
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/markdown.md.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/fixtures/markdown.md.erb b/spec/fixtures/markdown.md.erb
index 0cdbc32431d..51a3e91d201 100644
--- a/spec/fixtures/markdown.md.erb
+++ b/spec/fixtures/markdown.md.erb
@@ -116,7 +116,7 @@ Linking to a file relative to this project's repository should work.
Because life would be :zzz: without Emoji, right? :rocket:
-Get ready for the Emoji :bomb:: :+1::-1::ok_hand::wave::v::raised_hand::muscle:
+Get ready for the Emoji :bomb: : :+1: :-1: :ok_hand: :wave: :v: :raised_hand: :muscle:
### TableOfContentsFilter