Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/media_attachment.rb

2019-05-04 16:37:26 +02:00

..

audio_transcoder.rb

add env var for max length of audio uploads

2019-04-16 16:07:20 +02:00

blurhash_transcoder.rb

Add blurhash (#10630)

2019-04-27 03:24:09 +02:00

gif_transcoder.rb

Fix static GIFs being saved as empty files when using local storage (#8012)

2018-07-14 03:56:52 +02:00

lazy_thumbnail.rb

Unconditionally re-encode locally-uploaded images to strip metadata

2018-09-17 21:09:59 +02:00

video_transcoder.rb

…