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
..
account_action.rb	Fix account action type validation (#19476)	2022-10-30 02:44:32 +02:00
action_log.rb	Add audit log entries for user roles (#19040)	2022-08-25 20:39:40 +02:00
action_log_filter.rb	Fix inaccurate admin log entry for re-sending confirmation e-mails (#19674)	2022-11-02 18:50:21 +01:00
appeal_filter.rb	Add appeals (#17364)	2022-02-14 21:27:53 +01:00
import.rb	Allow import/export of instance-level domain blocks/allows (#1754)	2022-05-16 09:29:01 +02:00
status_batch_action.rb	Fix reblogs being discarded after the reblogged status (#19731)	2022-11-04 16:31:44 +01:00
status_filter.rb	Add ability to view previous edits of a status in admin UI (#19462)	2022-10-26 13:42:29 +02:00