spec/lib/sanitize/config_spec.rb:
Upstream rewrote top-level describe calls to RSpec.describe, and glitch-soc had differences in the first few tests because of the wider subset of HTML it accepts.
Changed describe to RSpec.describe as upstream did, keeping glitch-soc's tests.
Ported changes
fab29ebbe864f0aec84857fc3d87f0d56f4f6b9b
585e369e0bb0e17ff5e025385dfefde1e9e81fa3
Additional changes
cb1eaa10f21ae0524a0ea909c6271be2621dfade (fix glitch-soc-only tests affected by the RSpec changes)
Conflicts
spec/lib/sanitize/config_spec.rb: Upstream rewrote top-leveldescribecalls toRSpec.describe, and glitch-soc had differences in the first few tests because of the wider subset of HTML it accepts. ChangeddescribetoRSpec.describeas upstream did, keeping glitch-soc's tests.Ported changes
Additional changes