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

..

counters_spec.rb

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

finder_concern_spec.rb

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

interactions_spec.rb

Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream

2024-11-15 18:44:32 +01:00

sensitizes_spec.rb

Use nil instead of false for datetime value in spec (#32926)

2024-11-18 09:31:25 +00:00

silences_spec.rb

Move account silence-related methods to concern (#28866)

2024-11-11 08:29:55 +00:00

statuses_search_spec.rb

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

suspensions_spec.rb

Move account suspension related coverage to concern spec (#32432)

2024-10-25 07:58:41 +00:00