Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes.		2022-11-14 08:35:55 +01:00
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
fabricators	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
features	…
fixtures	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
helpers	Test the native_locale_name of a non-standard locale (#20284)	2022-11-11 00:06:18 +01:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-10 09:36:47 +01:00
mailers	…
models	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
policies	…
presenters	…
requests	…
routing	…
serializers/activitypub	…
services	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
support	…
validators	…
views/statuses	…
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	…