You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.		2 years ago
..
attachment_extensions.rb	Run rubocop formatting except line length (#23632)	2 years ago
blurhash_transcoder.rb	blurhash_transcoder: prevent out-of-bound reads with <8bpp images (#20388)	2 years ago
color_extractor.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2 years ago
gif_transcoder.rb	Fix animated GIF generates animated thumbnail (#16216)	4 years ago
image_extractor.rb	Fix media processing getting stuck on too much stdin/stderr (#16136)	4 years ago
lazy_thumbnail.rb	Update ESLint and RuboCop in Code Climate (#12534)	5 years ago
response_with_limit_adapter.rb	Fix upload of remote media with OpenStack Swift sometimes failing (#16998)	3 years ago
transcoder.rb	Fix audio always being re-encoded even for passthrough-eligible media (#1839)	2 years ago
type_corrector.rb	Add customizable thumbnails for audio and video attachments (#14145)	4 years ago
url_generator_extensions.rb	Switch from unmaintained paperclip to kt-paperclip (#16724)	3 years ago