mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-29 00:31:37 +01:00
5a55180b95
Conflicts: - `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. |
||
---|---|---|
.. | ||
appearance_controller_spec.rb | ||
base_controller_spec.rb | ||
notifications_controller_spec.rb | ||
other_controller_spec.rb |