Claire b2526316f5 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/pending_accounts/index.html.haml`: Removed upstream, while it had glitch-soc-specific changes to accomodate for glitch-soc's theming system. Removed the file. Additional changes: - `app/views/admin/accounts/index.html.haml': Accomodate for glitch-soc's theming system.		2021-12-16 16:20:44 +01: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	Fixed code quality issues (#15541)	2021-01-31 21:26:09 +01:00
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-16 16:20:44 +01:00
paperclip	Fix upload of remote media with OpenStack Swift sometimes failing (#16998)	2021-11-16 21:36:28 +01:00
rails	Fix obsolete digitalocean.rake file breaking rake tasks (#15618)	2021-02-11 02:11:30 +01:00
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-11-25 23:50:35 +01:00
templates	…
terrapin	Add Ruby 3.0 support (#16046)	2021-05-06 14:22:54 +02:00
webpacker	…
cli.rb	Fix tootctl self-destruct not sending Delete activities for recently-suspended accounts (#16688)	2021-10-14 19:59:28 +02:00
enumerable.rb	…
exceptions.rb	Fix media redownload worker retrying on unexpected response codes (#16111)	2021-05-05 23:46:59 +02:00