Claire e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.		2021-04-20 12:17:14 +02:00
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	2021-04-20 12:17:14 +02:00
v2
web	Add policy param to POST /api/v1/push/subscriptions (#16040)	2021-04-15 05:00:25 +02:00
base_controller_spec.rb
oembed_controller_spec.rb
proofs_controller_spec.rb