Claire ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `README.md`: Upstream updated its README, we have a completely different one. Kept glitch-soc's README. - `app/models/account.rb`: Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines. Ported upstream's changes.		2024-02-24 14:46:14 +01:00
..
counters_spec.rb	Add common ThreadingHelper module for specs (#29116)	2024-02-07 14:53:29 +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