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
..
blacklisted_email_validator_spec.rb	Add canonical e-mail blocks for suspended accounts (#16049)	4 years ago
disallowed_hashtags_validator_spec.rb	…
email_mx_validator_spec.rb	Bypass MX validation for explicitly allowed domains (#15930)	4 years ago
follow_limit_validator_spec.rb	…
note_length_validator_spec.rb	Fix URL scanning in note length validator and preview card fetching (#15827)	4 years ago
poll_validator_spec.rb	…
reaction_validator_spec.rb	…
status_length_validator_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
status_pin_validator_spec.rb	…
unique_username_validator_spec.rb	…
unreserved_username_validator_spec.rb	Add `details` to error response for `POST /api/v1/accounts` in REST API (#15803)	4 years ago
url_validator_spec.rb	Prepare Mastodon for zeitwerk autoloader (#15917)	4 years ago