Claire 61ef81c548 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests.		2022-01-23 18:24:01 +01:00
..
action_dispatch
active_record
assets
chewy/strategy
devise
generators
json_ld
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-23 18:24:01 +01:00
paperclip	Fix upload of remote media with OpenStack Swift sometimes failing (#16998)	2021-11-16 21:36:28 +01:00
rails
redis
sanitize_ext
tasks	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-23 18:24:01 +01:00
templates
terrapin	Add Ruby 3.0 support (#16046)	2021-05-06 14:22:54 +02:00
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	Fix media redownload worker retrying on unexpected response codes (#16111)	2021-05-05 23:46:59 +02:00
sidekiq_error_handler.rb	Fix warnings on Rails boot (#16946)	2021-12-27 00:47:20 +01:00