Claire 9a3d91f629 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.		2022-12-07 09:03:42 +01:00
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-07 09:03:42 +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	Add 'private' to Cache-Control, match Rails expectations (#20608)	2022-11-16 04:56:30 +01:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00