Claire b8209c3b96 Merge commit '85662a5a57' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream reworked the CSP, we kept our version for now. - `spec/requests/content_security_policy_spec.rb`: Upstream reworked the CSP, we kept our version for now.		2023-12-20 20:10:45 +01:00
..
v1	Merge commit '85662a5a57' into glitch-soc/merge-upstream	2023-12-20 20:10:45 +01:00
v2	Convert /instances/* controller specs to request specs (#27988)	2023-11-20 11:05:28 +00:00
web	Improve spec coverage for api/web/push_subscriptions controller (#27858)	2023-11-15 13:14:51 +00:00
base_controller_spec.rb	Fix RSpec/StubbedMock cop (#25552)	2023-07-12 10:20:10 +02:00
oembed_controller_spec.rb	DB speedup in API:: controller/request specs (#25516)	2023-10-13 14:42:09 +02:00