Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-03 04:17:11 +00:00
parent fa768abf5c 99f962ba73
commit 933840bebf
46 changed files with 1482 additions and 52 deletions
--- a/spec/lib/formatter_spec.rb
+++ b/spec/lib/formatter_spec.rb
@ -332,7 +332,7 @@ RSpec.describe Formatter do
    end

    context 'contains malicious classes' do
-      let(:text) { '<span class="status__content__spoiler-link">Show more</span>' }
+      let(:text) { '<span class="mention	status__content__spoiler-link">Show more</span>' }

      it 'strips malicious classes' do
        is_expected.to_not include 'status__content__spoiler-link'