Merge branch 'main' into glitch-soc/merge-upstream

2021-03-19 13:57:15 +01:00
parent ba22398c38 741d0952b1
commit 3ad6ef72cb
63 changed files with 408 additions and 398 deletions
--- a/spec/lib/sanitize_config_spec.rb
+++ b/spec/lib/sanitize_config_spec.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true

 require 'rails_helper'
-require Rails.root.join('app', 'lib', 'sanitize_config.rb')

 describe Sanitize::Config do
  shared_examples 'common HTML sanitization' do