Claire 3e63fcd4f0 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Minor upstream refactor moved hook definitions around, and glitch-soc has an extra `before_create`. Moved the `before_create` accordingly. - `app/services/batched_remove_status_service.rb`: Minor upstream refactor changed a block in which glitch-soc had one extra call to handle direct timelines. Adapted changes to keep glitch-soc's extra call.		2023-01-12 10:15:46 +01:00
..
config/initializers	Fix rate limiting for paths with formats (#20675)	2022-11-14 20:26:31 +01:00
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
fabricators	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
features	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
fixtures	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)	2022-11-17 11:05:09 +01:00
helpers	Use Rails tag API to build RSS feed for spoilers and polls (#20163)	2022-12-15 16:39:41 +01:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-12 10:15:46 +01:00
mailers	Add support for language preferences for trending statuses and links (#18288)	2022-10-08 16:45:40 +02:00
models	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
requests	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
routing	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
serializers/activitypub	…
services	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-12 10:15:46 +01:00
support	Validate nodeinfo response by schema (#21395)	2022-12-15 15:43:05 +01:00
validators	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-10 11:51:43 +02:00
views/statuses	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
workers	Fix followers count not being updated when migrating follows (#19998)	2022-11-07 15:38:55 +01:00
rails_helper.rb	…
spec_helper.rb	…