Claire fbfc4145fd Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
  Applied the changes there.

2023-08-24 21:01:19 +02:00

..

v1

Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream

2023-08-24 21:01:19 +02:00

v2

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

2023-07-05 12:01:26 +02:00

web

Fix embed dropdown menu item for unauthenticated users (#25964)

2023-07-13 15:53:03 +02:00

base_controller.rb

Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)

2023-08-02 19:32:48 +02:00

oembed_controller.rb

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

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