mastodon/lib/paperclip
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
..
attachment_extensions.rb Remove dependency on running Redis server for db:setup (#18560) 2022-06-01 19:23:31 +02:00
blurhash_transcoder.rb blurhash_transcoder: prevent out-of-bound reads with <8bpp images (#20388) 2022-11-11 07:45:16 +01:00
color_extractor.rb
gif_transcoder.rb
image_extractor.rb
lazy_thumbnail.rb
response_with_limit_adapter.rb Fix upload of remote media with OpenStack Swift sometimes failing (#16998) 2021-11-16 21:36:28 +01:00
transcoder.rb Fix audio always being re-encoded even for passthrough-eligible media (#1839) 2022-09-02 09:29:31 +02:00
type_corrector.rb
url_generator_extensions.rb