mastodon/lib
Claire c85c3fb708 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream updated `jest`, moving its config in a separate file.
  This config was modified in glitch-soc, so the corresponding changes have
  been ported to `jest.config.js`
2022-05-04 19:15:50 +02:00
..
active_record
assets
chewy/strategy
devise
generators
json_ld
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-05-04 19:15:50 +02:00
paperclip fix: `s3_force_single_request` not parsed (#17922) 2022-04-01 23:56:23 +02:00
rails
redis
sanitize_ext Fix link sanitization for outgoing text/html and text/markdown toots 2022-04-11 09:06:25 +02:00
tasks Merge branch 'main' into glitch-soc/merge-upstream 2022-05-01 16:52:27 +02:00
templates
terrapin Add Ruby 3.0 support (#16046) 2021-05-06 14:22:54 +02:00
webpacker
cli.rb Add ability for admins to delete canonical email blocks (#16644) 2021-12-17 23:02:14 +01:00
enumerable.rb
exceptions.rb Fix error resposes for `from` search prefix (#17963) 2022-04-08 21:21:49 +02:00