Claire 75580360cd Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Upstream fixed a bunch lint issues, and changed the `Max` parameter of the `Metrics/AbcSize` cop. Glitch-soc has different code and slightly higher `AbcSize` complexity, modified the `.rubocop_todo.yml` file accordingly. - `app/policies/status_policy.rb`: Upstream changed `account.suspended?` to `account.unavailable?` to prepare for delete flags. Glitch-soc has additional local-only conditions. Ported upstream's refactor while keeping glitch-soc's additional condition. - `app/serializers/initial_state_serializer.rb`: Upstream refactored a bunch of stuff while glitch-soc has more settings. Refactored as upstream did while keeping glitch-soc's settings.		2023-12-20 22:05:31 +01:00
..
counters_spec.rb	Model concerns organization into module namespaces (#28149)	2023-12-01 11:00:41 +00:00
finder_concern_spec.rb	Model concerns organization into module namespaces (#28149)	2023-12-01 11:00:41 +00:00
interactions_spec.rb	Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream	2023-12-20 22:05:31 +01:00
statuses_search_spec.rb	Model concerns organization into module namespaces (#28149)	2023-12-01 11:00:41 +00:00