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 178e151019 Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream ... Conflicts: - `app/models/user_settings.rb`: Upstream added a constraint on a setting textually close to glitch-soc-only settings. Applied upstream's change. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for the `translate` attribute on a few elements, where glitch-soc had a different set of allowed elements and attributes. Extended glitch-soc's allowed attributes with `translate` as upstream did. - `spec/validators/status_length_validator_spec.rb`: Upstream refactored to use RSpec's `instance_double` instead of `double`, but glitch-soc had changes to tests due to configurable max toot chars. Applied upstream's changes while keeping tests against configurable max toot chars.		1 year ago
..
admin	Fix incorrect pagination headers in `/api/v2/admin/accounts` (#25477)	1 year ago
filters	Fix Rails/ActionOrder cop (#24692)	2 years ago
filters_controller.rb	Fix Rails/ActionOrder cop (#24692)	2 years ago
instances_controller.rb	Change unauthenticated responses to be cached in REST API (#24348)	2 years ago
media_controller.rb	Make it possible to upload audio and video to Heroku app (#24866)	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