Claire 077e0c6812 Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.		2023-12-20 22:16:50 +01:00
..
accounts	Deduplicate IDs in relationships and familiar_followers APIs (#27982)	2023-11-23 10:00:09 +00:00
admin	Use the Admin::ActionLog fabricator in admin/action_logs spec (#28194)	2023-12-04 12:56:28 +00:00
apps	Feature: Allow token introspection without read scope (#27142)	2023-10-18 14:10:07 +02:00
emails	Migrate to request specs in /api/v1/emails/confirmations (#25686)	2023-07-17 16:22:33 +02:00
instances	Convert /instances/* controller specs to request specs (#27988)	2023-11-20 11:05:28 +00:00
lists	Reduce .times usage in request and controller specs (#27949)	2023-11-21 13:05:59 +00:00
statuses	Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream	2023-12-19 20:51:37 +01:00
timelines	Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream	2023-10-17 21:35:07 +02:00
accounts_spec.rb	Rewrite /api/v1/accounts tests as request specs (#27888)	2023-11-17 11:34:49 +00:00
apps_spec.rb	DB speedup in API:: controller/request specs (#25516)	2023-10-13 14:42:09 +02:00
blocks_spec.rb	Migrate to request specs in /api/v1/blocks (#25517)	2023-10-16 16:03:35 +02:00
bookmarks_spec.rb	Reduce .times usage in request and controller specs (#27949)	2023-11-21 13:05:59 +00:00
csp_spec.rb	Specs for minimal CSP policy in Api:: controllers (#27845)	2023-11-14 14:34:30 +00:00
custom_emojis_spec.rb	Convert api/v1/custom_emojis controller spec to request spec (#27985)	2023-11-20 11:05:24 +00:00
domain_blocks_spec.rb	DB speedup in API:: controller/request specs (#25516)	2023-10-13 14:42:09 +02:00
endorsements_spec.rb	Convert api/v1/endorsements controller spec to request spec (#27984)	2023-11-20 09:32:28 +00:00
favourites_spec.rb	Reduce .times usage in request and controller specs (#27949)	2023-11-21 13:05:59 +00:00
featured_tags_spec.rb	Reduce .times usage in request and controller specs (#27949)	2023-11-21 13:05:59 +00:00
follow_requests_spec.rb	Reduce .times usage in request and controller specs (#27949)	2023-11-21 13:05:59 +00:00
followed_tags_spec.rb	Reduce .times usage in request and controller specs (#27949)	2023-11-21 13:05:59 +00:00
instance_spec.rb	Fix test failure caused by glitch-soc changes	2023-12-19 21:14:39 +01:00
lists_spec.rb	Remove triple subject call in api/v1/lists spec (#28210)	2023-12-04 15:28:19 +00:00
media_spec.rb	Fix RSpec/MetadataStyle cop in spec/ (#27729)	2023-11-06 14:28:20 +00:00
mutes_spec.rb	Reduce .times usage in request and controller specs (#27949)	2023-11-21 13:05:59 +00:00
notifications_spec.rb	Reduce .times usage in request and controller specs (#27949)	2023-11-21 13:05:59 +00:00
polls_spec.rb	Migrate to request specs in /api/v1/polls (#25596)	2023-07-17 16:50:00 +02:00
preferences_spec.rb	Convert api/v1/preferences controller spec to request spec (#27987)	2023-11-20 09:39:45 +00:00
profiles_spec.rb	Refactor Api::V1::ProfilesController into two separate controllers (#26573)	2023-08-21 15:47:09 +02:00
reports_spec.rb	Fix duplicate tests (#27395)	2023-10-13 16:10:43 +02:00
scheduled_status_spec.rb	Convert api/v1/scheduled_statuses controller spec to request spec (#27986)	2023-11-20 09:36:49 +00:00
statuses_spec.rb	Reduce .times usage in request and controller specs (#27949)	2023-11-21 13:05:59 +00:00
suggestions_spec.rb	Migrate to request specs in /api/v1/suggestions (#25540)	2023-06-22 11:49:35 +02:00
tags_spec.rb	DB speedup in API:: controller/request specs (#25516)	2023-10-13 14:42:09 +02:00