Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.

2022-11-14 08:35:55 +01:00

..

account_action.rb

Fix account action type validation (#19476)

2022-10-30 02:44:32 +02:00

action_log_filter.rb

Fix error when passing unknown filter param in REST API (#20626)

2022-11-14 08:06:06 +01:00

action_log.rb

Add audit log entries for user roles (#19040)

2022-08-25 20:39:40 +02:00

appeal_filter.rb

Fix error when passing unknown filter param in REST API (#20626)

2022-11-14 08:06:06 +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

Fix error when passing unknown filter param in REST API (#20626)

2022-11-14 08:06:06 +01:00