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
..
blacklisted_email_validator_spec.rb
disallowed_hashtags_validator_spec.rb
email_mx_validator_spec.rb
follow_limit_validator_spec.rb
note_length_validator_spec.rb
poll_validator_spec.rb
reaction_validator_spec.rb
status_length_validator_spec.rb
status_pin_validator_spec.rb
unique_username_validator_spec.rb
unreserved_username_validator_spec.rb
url_validator_spec.rb