Claire cd1e3ac2c7 Merge commit '7e1a77ea51e6dc4aecbf678f8928aa96698fa072' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/timelines/public_controller.rb`: Upstream refactored this code, the conflict was because of an extra supported parameter, `allow_local_only`. Updated the controller to follow upstream's refactor, and moved the extra parameter definition accordingly.		2023-12-19 19:51:40 +01:00
..
v1	Merge commit '7e1a77ea51e6dc4aecbf678f8928aa96698fa072' into glitch-soc/merge-upstream	2023-12-19 19:51:40 +01: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	Specs for minimal CSP policy in Api:: controllers (#27845)	2023-11-14 14:34:30 +00:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00