Claire 9f92b05bd2 Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated their README but we have a completely different one. Kept our version of `README.md`		2023-12-10 18:05:02 +01:00
..
accounts	Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream	2023-12-10 18:05:02 +01:00
admin	Migrate to request specs in /api/v1/admin/accounts (#25563)	2023-10-16 15:49:12 +02:00
announcements	DB speedup in API:: controller/request specs (#25516)	2023-10-13 14:42:09 +02:00
featured_tags	Specs api v1 controllers (#23930)	2023-03-04 17:12:54 +01:00
instances	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	DB speedup in API:: controller/request specs (#25516)	2023-10-13 14:42:09 +02:00
timelines	Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream	2023-10-17 21:35:07 +02:00
trends	Fix RSpec/InferredSpecType cop (#24736)	2023-05-04 05:49:53 +02:00
accounts_controller_spec.rb	DB speedup in API:: controller/request specs (#25516)	2023-10-13 14:42:09 +02: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
custom_emojis_controller_spec.rb	Fix RSpec/InferredSpecType cop (#24736)	2023-05-04 05:49:53 +02:00
directories_controller_spec.rb	Fix performances of profile directory (#26842)	2023-09-07 18:55:25 +02:00
endorsements_controller_spec.rb	Fix RSpec/InferredSpecType cop (#24736)	2023-05-04 05:49:53 +02:00
filters_controller_spec.rb	DB speedup in API:: controller/request specs (#25516)	2023-10-13 14:42:09 +02:00
instances_controller_spec.rb	Fix RSpec/InferredSpecType cop (#24736)	2023-05-04 05:49:53 +02:00
markers_controller_spec.rb	DB speedup in API:: controller/request specs (#25516)	2023-10-13 14:42:09 +02:00
preferences_controller_spec.rb	Specs api v1 controllers (#23930)	2023-03-04 17:12:54 +01:00
scheduled_statuses_controller_spec.rb	Specs api v1 controllers (#23930)	2023-03-04 17:12:54 +01:00
statuses_controller_spec.rb	DB speedup in API:: controller/request specs (#25516)	2023-10-13 14:42:09 +02:00
streaming_controller_spec.rb	Enable Rubocop Style/StringConcatenation defaults (#23792)	2023-02-22 09:54:36 +09:00