mastodon/lib
Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.
2022-11-12 13:28:03 +01:00
..
active_record
assets png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
chewy/strategy
devise
generators
json_ld
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-11-12 13:28:03 +01:00
paperclip Merge branch 'main' into glitch-soc/merge-upstream 2022-11-12 13:28:03 +01:00
rails
redis
sanitize_ext
simple_navigation Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
tasks Merge branch 'main' into glitch-soc/merge-upstream 2022-11-12 13:28:03 +01:00
templates
terrapin
webpacker
cli.rb
enumerable.rb
exceptions.rb Improve error reporting and logging when processing remote accounts (#15605) 2022-09-20 23:30:26 +02:00