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
color_extractor.rb
gif_transcoder.rb
image_extractor.rb Fix media processing getting stuck on too much stdin/stderr (#16136) 2021-05-05 19:44:01 +02:00
lazy_thumbnail.rb Update ESLint and RuboCop in Code Climate (#12534) 2019-12-02 18:25:43 +01:00
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
type_corrector.rb Add customizable thumbnails for audio and video attachments (#14145) 2020-06-29 13:56:55 +02:00
url_generator_extensions.rb