This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/lib
Claire 3869daef09 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Not really a conflict, upstream updated a dependency textually adjacent to a
  glitch-soc-only one.
  Updated the dependency as upstream did.
2022-05-03 10:16:49 +02:00
..
active_record
assets
chewy/strategy
devise
generators
json_ld
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-05-03 10:16:49 +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
webpacker
cli.rb
enumerable.rb
exceptions.rb Fix error resposes for `from` search prefix (#17963) 2022-04-08 21:21:49 +02:00