mastodon/app/controllers/api
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
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:35:55 +01:00
v2 Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:35:55 +01:00
web Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
base_controller.rb Fix error when passing unknown filter param in REST API (#20626) 2022-11-14 08:06:06 +01:00
oembed_controller.rb Fix OEmbed leaking information about existence of non-public statuses (#12930) 2020-01-24 00:20:51 +01:00