Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.		2022-11-06 09:50:41 +01:00
..
disputes
settings	Change settings area to be separated into categories in admin UI (#19407)	2022-10-22 11:44:41 +02:00
users
account_moderation_notes_controller_spec.rb
accounts_controller_spec.rb
action_logs_controller_spec.rb	Fix admin action logs page (#19649)	2022-11-03 16:06:42 +01:00
base_controller_spec.rb
change_email_controller_spec.rb
confirmations_controller_spec.rb
custom_emojis_controller_spec.rb
dashboard_controller_spec.rb
domain_allows_controller_spec.rb	Fix tests	2022-07-05 13:17:57 +02:00
domain_blocks_controller_spec.rb
email_domain_blocks_controller_spec.rb
export_domain_allows_controller_spec.rb	Fix tests	2022-07-05 13:17:57 +02:00
export_domain_blocks_controller_spec.rb	Fix tests	2022-07-05 13:17:57 +02:00
instances_controller_spec.rb
invites_controller_spec.rb
report_notes_controller_spec.rb
reports_controller_spec.rb
resets_controller_spec.rb
roles_controller_spec.rb
statuses_controller_spec.rb
tags_controller_spec.rb