Claire c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug.		2023-06-10 16:48:01 +02:00
..
v1	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream	2023-06-10 16:48:01 +02:00
v2	Fix RSpec/InferredSpecType cop (#24736)	2023-05-04 05:49:53 +02:00
web	Fix RSpec/MultipleSubjects cop (#24738)	2023-05-04 05:48:35 +02:00
base_controller_spec.rb	Fix Lint/ConstantDefinitionInBlock cop (#24763)	2023-05-03 10:32:30 +02:00
oembed_controller_spec.rb	Fix RSpec/InferredSpecType cop (#24736)	2023-05-04 05:49:53 +02:00