summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-08-25 16:44:14 +0000
committerDouwe Maan <douwe@gitlab.com>2015-08-25 16:44:14 +0000
commit2df94f9763192aa67a1e8ff3bc82badc685181aa (patch)
treeef80f6c71c2b8362f9ed46e84b8f0e32d3ea18af
parenta0284b5b85378be291c263e4f60c725c807c1a6f (diff)
parent646c1f0324650c5736e85db0deb55dceb943fa7a (diff)
downloadgitlab-ce-2df94f9763192aa67a1e8ff3bc82badc685181aa.tar.gz
Merge branch 'rs-re-enable-user-reference-spec' into 'master'
Re-enable the "links with adjacent text" UserReferenceFilter spec See merge request !1194
-rw-r--r--spec/lib/gitlab/markdown/user_reference_filter_spec.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/lib/gitlab/markdown/user_reference_filter_spec.rb b/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
index a5405e14a73..02d923b036c 100644
--- a/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
@@ -121,7 +121,6 @@ module Gitlab::Markdown
end
it 'links with adjacent text' do
- skip "TODO (rspeicher): Re-enable when usernames can't end in periods."
doc = filter("Mention me (#{reference}.)")
expect(doc.to_html).to match(/\(<a.+>#{reference}<\/a>\.\)/)
end