Claire b474cbbd28 Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/accounts/relationships_controller.rb`: We differed by listing suspended users when requesting relationships. Updated to upstream's code.		2023-12-18 18:40:58 +01:00
..
chewy	Add new public status index (#26344)	2023-08-24 16:40:04 +02:00
config/initializers/rack	Fix RSpec/SpecFilePathFormat cops (#27730)	2023-11-06 16:25:40 +00:00
controllers	Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream	2023-12-18 18:40:58 +01:00
fabrication	Restore console behavior in test env (#26401)	2023-08-09 11:26:56 +02:00
fabricators	Fix RSpec/MessageChain cop (#27776)	2023-11-09 12:57:23 +00:00
features	Stub controller methods and remove rubocop:disable in captcha feature spec (#27743)	2023-11-07 09:15:30 +00:00
fixtures	Remove unused stub json ld context (#25454)	2023-10-16 15:38:27 +02:00
generators	Rails 7.1 update (#25963)	2023-10-23 17:58:29 +00:00
helpers	Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream	2023-12-18 18:34:25 +01:00
lib	Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream	2023-12-18 18:34:25 +01:00
locales	Replace i18n view spec with helper spec (#24966)	2023-05-15 17:25:04 +02:00
mailers	Misc spec/refactor to user mailer and user mailer spec (#27486)	2023-10-27 09:57:16 +00:00
models	Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream	2023-12-18 18:34:25 +01:00
policies	Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream	2023-09-15 20:57:40 +02:00
presenters	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream	2023-06-10 16:48:01 +02:00
requests	Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream	2023-12-18 18:40:58 +01:00
routing	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
search/models/concerns	Add search tests (#26703)	2023-09-08 16:17:55 +02:00
serializers	Consolidate JSON parsing in serializers specs (#27693)	2023-11-07 15:20:24 +00:00
services	Fix RSpec/InstanceVariable cop (#27766)	2023-11-08 15:42:30 +00:00
support	Move RSpec config for streaming/search managers to be near classes (#27761)	2023-11-08 13:04:17 +00:00
system	Fixes website not loading for unlogged users (#27698)	2023-11-04 21:52:56 +00:00
validators	Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream	2023-12-18 18:34:25 +01:00
views	Fix RSpec/MetadataStyle cop in spec/ (#27729)	2023-11-06 14:28:20 +00:00
workers	Fix RSpec/MessageSpies cop (#27751)	2023-11-07 09:46:28 +00:00
rails_helper.rb	Move RSpec config for streaming/search managers to be near classes (#27761)	2023-11-08 13:04:17 +00:00
spec_helper.rb	Move search and streaming spec manager classes to separate support files (#27727)	2023-11-07 15:25:49 +00:00