Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`		2021-11-25 23:50:35 +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	Fix unnecessary queries when batch-removing statuses, 100x faster (#15387)	2020-12-22 17:13:55 +01:00
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-11-25 23:50:35 +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	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	2020-07-01 19:05:21 +02:00
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	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
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	Optimize map { ... }.compact calls (#15513)	2021-01-10 00:32:01 +01:00
exceptions.rb	Fix media redownload worker retrying on unexpected response codes (#16111)	2021-05-05 23:46:59 +02:00