mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-29 13:15:40 +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. |
||
|---|---|---|
| .. | ||
| action_dispatch | ||
| active_record | ||
| arel | ||
| assets | ||
| chewy | ||
| devise/strategies | ||
| elasticsearch | ||
| generators/post_deployment_migration | ||
| linter | ||
| mastodon | ||
| paperclip | ||
| rails | ||
| redis | ||
| sanitize_ext | ||
| simple_navigation | ||
| stoplight | ||
| tasks | ||
| templates/haml/scaffold | ||
| terrapin | ||
| webpacker | ||
| exceptions.rb | ||
| premailer_bundled_asset_strategy.rb | ||
| public_file_server_middleware.rb | ||