Claire eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change.		2022-10-30 18:15:28 +01:00
..
account_action.rb	Fix account action type validation (#19476)	2022-10-30 02:44:32 +02:00
action_log_filter.rb	Add admin API for managing canonical e-mail blocks (#19067)	2022-08-28 03:31:54 +02:00
action_log.rb	Add audit log entries for user roles (#19040)	2022-08-25 20:39:40 +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 using wrong policy on status-related actions in admin UI (#19490)	2022-10-28 00:48:30 +02: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