Claire 9a3d91f629 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.		2022-12-07 09:03:42 +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-07 09:03:42 +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	Test the native_locale_name of a non-standard locale (#20284)	2022-11-11 00:06:18 +01:00
lib	Use a tree‐based approach for advanced text formatting (#1907)	2022-12-02 10:29:42 +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	2022-12-07 09:03:42 +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-10-28 19:23:58 +02: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	Fix unbounded recursion in account discovery (#22025)	2022-12-07 00:15:24 +01:00
support
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