Claire 3e63fcd4f0 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Minor upstream refactor moved hook definitions around, and glitch-soc has an extra `before_create`. Moved the `before_create` accordingly. - `app/services/batched_remove_status_service.rb`: Minor upstream refactor changed a block in which glitch-soc had one extra call to handle direct timelines. Adapted changes to keep glitch-soc's extra call.		2023-01-12 10:15:46 +01:00
..
components	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-12 10:15:46 +01:00
containers	Don't autofocus the compose form (#16517)	2022-12-15 17:37:05 +01:00
util	Enable eslint:recommended ruleset (#22433)	2022-12-19 00:51:37 +09:00
index.js	Don't autofocus the compose form (#16517)	2022-12-15 17:37:05 +01:00