You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		4 years ago
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
v2	Add more granular OAuth scopes (#7929)	7 years ago
web	Add `policy` param to `POST /api/v1/push/subscriptions` (#16040)	4 years ago
base_controller_spec.rb	Change unconfirmed user login behaviour (#11375)	6 years ago
oembed_controller_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
proofs_controller_spec.rb	Fix base64-encoded file uploads not being possible (#12748)	5 years ago