Claire f5b7307890 Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream ...

Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's version of the conflicting lines.

2023-12-21 19:24:10 +01:00

..

accounts

Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream

2023-12-21 18:17:17 +01:00

admin/trends

Convert measurement api/v1/admin/* controller specs to request specs (#28005)

2023-11-21 14:25:07 +00:00

announcements

DB speedup in API:: controller/request specs (#25516)

2023-10-13 14:42:09 +02:00

polls

DB speedup in API:: controller/request specs (#25516)

2023-10-13 14:42:09 +02:00

push

Autofix Rubocops RSpec/ScatteredLet (#23725)

2023-02-20 11:17:41 +09:00

statuses

Consolidate configuration of Sidekiq::Testing.fake! setup (#28046)

2023-11-23 09:43:43 +00:00

timelines

Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream

2023-10-17 21:35:07 +02:00

trends

Spec coverage for api/v1/trends controllers (#27837)

2023-11-13 14:32:36 +00:00

announcements_controller_spec.rb

DB speedup in API:: controller/request specs (#25516)

2023-10-13 14:42:09 +02:00

conversations_controller_spec.rb

DB speedup in API:: controller/request specs (#25516)

2023-10-13 14:42:09 +02:00

filters_controller_spec.rb

DB speedup in API:: controller/request specs (#25516)

2023-10-13 14:42:09 +02:00

markers_controller_spec.rb

DB speedup in API:: controller/request specs (#25516)

2023-10-13 14:42:09 +02:00

streaming_controller_spec.rb

Fix RSpec/InstanceVariable cop (#27766)

2023-11-08 15:42:30 +00:00