Claire 3d25fe0426 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream changed the workflow a bit. Conflict comes from us pushing to ghcr while upstream pushes to dockerhub. Ported the upstream changes while still pushing to ghcr.		2022-02-23 18:13:12 +01:00
..
action_dispatch
active_record	Remove dependency on pluck_each gem (#16012)	2021-04-12 03:35:58 +02:00
assets
chewy/strategy
devise
generators
json_ld
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-23 18:13:12 +01:00
paperclip	Fix some media attachments being converted with too high framerates (#17619)	2022-02-22 17:11:22 +01:00
rails
redis
sanitize_ext
tasks	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-08 18:23:53 +01:00
templates
terrapin
webpacker
cli.rb	Add ability for admins to delete canonical email blocks (#16644)	2021-12-17 23:02:14 +01:00
enumerable.rb
exceptions.rb
sidekiq_error_handler.rb	Fix warnings on Rails boot (#16946)	2021-12-27 00:47:20 +01:00