Claire 8ec4be4233 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream-updated dependency (redis) textually too close to glitch-soc-only dependecy. Updated redis gem like upstream did.		2021-08-09 23:25:49 +02:00
..
action_dispatch	replace all instances of "ends_with?" with "end_with?" (#15745)	2021-02-19 09:56:14 +01:00
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	2021-08-09 23:25:49 +02:00
paperclip	Fix unsupported video error message handling (#16581)	2021-08-08 15:28:57 +02:00
rails	…
redis	…
sanitize_ext	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-19 13:57:15 +01:00
tasks	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-13 17:57:15 +02:00
templates	…
terrapin	Add Ruby 3.0 support (#16046)	2021-05-06 14:22:54 +02:00
webpacker	…
cli.rb	…
enumerable.rb	…
exceptions.rb	Fix media redownload worker retrying on unexpected response codes (#16111)	2021-05-05 23:46:59 +02:00