summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-08-26 17:53:31 -0700
committerDouwe Maan <douwe@gitlab.com>2015-08-26 17:53:31 -0700
commit843694f90270e290f164bed68362500c9e331a46 (patch)
tree0e20cc09df536365db817ba8aef4c77d3d0c684e /spec/lib
parent6afd69f4445cc0688aa1695389eb3f79033e3121 (diff)
parentde3b7d9c522db8d129a64f2b86297cf90413cb1e (diff)
downloadgitlab-ce-843694f90270e290f164bed68362500c9e331a46.tar.gz
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
Diffstat (limited to 'spec/lib')
-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