Claire 077e0c6812 Merge commit '0b4a3a0437' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.		2023-12-20 22:16:50 +01:00
..
account	Merge commit '272592d16d' into glitch-soc/merge-upstream	2023-12-20 22:05:31 +01:00
status	Model concerns organization into module namespaces (#28149)	2023-12-01 11:00:41 +00:00
remotable_spec.rb	Fix Lint/SymbolConversion cop (#28175)	2023-12-01 15:53:35 +00:00