Claire 42a0898f16 Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because glitch-soc does not have a theme selector here.		2023-06-10 18:42:29 +02:00
..
chewy
config/initializers	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
controllers	Merge commit '16dd3f08c1e5396d5f9ff3f13417901bc4e4b8b9' into glitch-soc/merge-upstream	2023-06-10 17:18:36 +02:00
fabricators	Use build where possible in fabricators (#25360)	2023-06-10 18:29:01 +02:00
features	Fix RSpec/MissingExampleGroupArgument cop (#25310)	2023-06-06 15:51:42 +02:00
fixtures	Add support for importing lists (#25203)	2023-06-01 14:47:31 +02:00
generators
helpers	Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream	2023-06-10 15:32:29 +02:00
lib	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream	2023-06-10 16:48:01 +02:00
locales	Replace i18n view spec with helper spec (#24966)	2023-05-15 17:25:04 +02:00
mailers	Fix RSpec/DescribedClass cop (#25104)	2023-06-06 13:58:33 +02:00
models	Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream	2023-06-10 18:42:29 +02:00
policies	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream	2023-06-10 16:48:01 +02:00
presenters	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream	2023-06-10 16:48:01 +02:00
requests	Migrate to request specs in /api/v1/admin/email_domain_blocks (#25337)	2023-06-09 14:00:14 +02:00
routing
serializers	Fix RSpec/DescribedClass cop (#25104)	2023-06-06 13:58:33 +02:00
services	Fix RSpec/MissingExampleGroupArgument cop (#25310)	2023-06-06 15:51:42 +02:00
support	Disable paperclip processing in specs (#25359)	2023-06-10 18:27:35 +02:00
validators	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream	2023-06-10 16:48:01 +02:00
views/statuses	Replace i18n view spec with helper spec (#24966)	2023-05-15 17:25:04 +02:00
workers	Fix RSpec/ExpectChange cop (#25101)	2023-05-24 11:23:40 +02:00
fabricators_spec.rb
rails_helper.rb	Disable paperclip processing in specs (#25359)	2023-06-10 18:27:35 +02:00
spec_helper.rb	Enable Rubocop Rails/FilePath (#23854)	2023-05-04 05:50:40 +02:00