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

Conflicts:
- `app/models/custom_emoji.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific validation.
  Applied upstream changes.
- `app/models/public_feed.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific parameter documentation.
  Applied upstream changes.

2022-11-10 09:36:47 +01:00

..

v1

Merge branch 'main' into glitch-soc/merge-upstream

2022-11-10 09:36:47 +01:00

v2

Merge branch 'main' into glitch-soc/merge-upstream

2022-11-06 09:50:41 +01:00

web

Refactor formatter (#17828)

2022-03-26 02:53:34 +01:00

base_controller.rb

Change AUTHORIZED_FETCH to not block unauthenticated REST API access (#19803)

2022-11-05 22:56:03 +01:00

oembed_controller.rb

Fix OEmbed leaking information about existence of non-public statuses (#12930)

2020-01-24 00:20:51 +01:00