e61a7794f8
Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Conflict because glitch-soc has a different list of allowed tags. Added upstream's new allowed tags while keeping ours. - `spec/requests/api/v1/timelines/public_spec.rb`: Conflict because of glitch-soc's default settings. Updated accordingly. |
||
|---|---|---|
| .. | ||
| chewy | ||
| config/initializers/rack | ||
| controllers | ||
| fabrication | ||
| fabricators | ||
| fixtures | ||
| generators | ||
| helpers | ||
| lib | ||
| locales | ||
| mailers | ||
| models | ||
| policies | ||
| presenters | ||
| requests | ||
| routing | ||
| search/models/concerns/account | ||
| serializers | ||
| services | ||
| support | ||
| system | ||
| validators | ||
| views | ||
| workers | ||
| flatware_helper.rb | ||
| rails_helper.rb | ||
| spec_helper.rb | ||