Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.		2022-11-12 13:28:03 +01:00
..
active_record	Remove dependency on pluck_each gem (#16012)	2021-04-12 03:35:58 +02:00
assets	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
chewy/strategy	Change search indexing to use batches to minimize resource usage (#18451)	2022-05-18 23:29:14 +02:00
devise	Fix authentication before 2FA challenge (#11943)	2019-09-24 04:35:36 +02:00
generators
json_ld
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
paperclip	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
rails
redis	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	2020-07-01 19:05:21 +02:00
sanitize_ext	Fix link sanitization for outgoing text/html and text/markdown toots	2022-04-11 09:06:25 +02:00
simple_navigation	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
tasks	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
templates
terrapin
webpacker
cli.rb
enumerable.rb	Optimize map { ... }.compact calls (#15513)	2021-01-10 00:32:01 +01:00
exceptions.rb	Improve error reporting and logging when processing remote accounts (#15605)	2022-09-20 23:30:26 +02:00