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 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes.		2 years ago
..
admin	Fix `role_ids` not accepting arrays in admin API (#20625)	2 years ago
filters	Move V2 Filter methods under /api/v2 prefix (#20622)	2 years ago
filters_controller.rb	Revamp post filtering system (#18058)	2 years ago
instances_controller.rb	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	2 years ago
media_controller.rb	Change post-processing to be deferred only for large media types (#19617)	2 years ago
search_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
suggestions_controller.rb	Add cold-start follow recommendations (#15945)	4 years ago