Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.		2022-08-28 11:31:00 +02:00
..
account_action.rb	Fix warning an account outside of a report closing all reports for that account (#18387)	2022-05-23 20:38:29 +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	Add admin API for managing canonical e-mail blocks (#19067)	2022-08-28 03:31:54 +02: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 being able to report otherwise inaccessible statuses (#18528)	2022-05-26 22:08:02 +02:00
status_filter.rb	Fix admin statuses page order with media (#17538)	2022-02-14 16:07:04 +01:00