Claire ac2dae0d11 Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-releases.yml`: Upstream changed comments close to a line we modified to account for different container image repositories. Updated the comments as upstream did.		2023-09-02 13:50:16 +02:00
..
v1	Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream	2023-09-02 13:50:16 +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