Claire 6374937147 Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream ... Conflicts: - `app/models/trends/statuses.rb`: Upstream added a date restriction to trendable posts, while glitch-soc had slightly different conditions. Added the date restriction to glitch-soc's conditions.		2024-11-24 16:46:28 +01:00
..
account	Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream	2024-11-24 16:46:28 +01:00
status	Enable "zero monkey patching" mode in RSpec (#31614)	2024-09-04 05:12:25 +00:00
remotable_spec.rb	Fix `Performance/StringIdentifierArgument` cop (#28399)	2023-12-18 10:26:09 +00:00