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
reports
settings	Change settings area to be separated into categories in admin UI (#19407)	2022-10-22 11:44:41 +02:00
trends	Add ability to view previous edits of a status in admin UI (#19462)	2022-10-26 13:42:29 +02:00
users
webhooks
account_actions_controller.rb
account_moderation_notes_controller.rb
accounts_controller.rb
action_logs_controller.rb
announcements_controller.rb
base_controller.rb
change_emails_controller.rb
confirmations_controller.rb	Fix inaccurate admin log entry for re-sending confirmation e-mails (#19674)	2022-11-02 18:50:21 +01:00
custom_emojis_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
dashboard_controller.rb
domain_allows_controller.rb
domain_blocks_controller.rb
email_domain_blocks_controller.rb
export_domain_allows_controller.rb
export_domain_blocks_controller.rb	Fix domain block export not exporting blocks with only media rejection	2022-10-28 20:14:25 +02:00
follow_recommendations_controller.rb
instances_controller.rb
invites_controller.rb
ip_blocks_controller.rb	Fix IP blocks not having a unique index (#19456)	2022-10-25 21:43:44 +02:00
relationships_controller.rb
relays_controller.rb
report_notes_controller.rb
reports_controller.rb
resets_controller.rb
roles_controller.rb
rules_controller.rb
settings_controller.rb	Change settings area to be separated into categories in admin UI (#19407)	2022-10-22 11:44:41 +02:00
site_uploads_controller.rb	Change settings area to be separated into categories in admin UI (#19407)	2022-10-22 11:44:41 +02:00
statuses_controller.rb	Add ability to view previous edits of a status in admin UI (#19462)	2022-10-26 13:42:29 +02:00
tags_controller.rb
warning_presets_controller.rb
webhooks_controller.rb