You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 2a7538aeed 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.		2 years ago
..
account_action.rb	Fix warning an account outside of a report closing all reports for that account (#18387)	3 years ago
action_log.rb	Add audit log entries for user roles (#19040)	2 years ago
action_log_filter.rb	Add admin API for managing canonical e-mail blocks (#19067)	2 years ago
appeal_filter.rb	Add appeals (#17364)	3 years ago
import.rb	Allow import/export of instance-level domain blocks/allows (#1754)	3 years ago
status_batch_action.rb	Fix being able to report otherwise inaccessible statuses (#18528)	2 years ago
status_filter.rb	Fix admin statuses page order with media (#17538)	3 years ago