Claire 9ae60f8738 Merge commit '82e477b184' into glitch-soc/merge-upstream ... Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.		2023-07-12 16:03:05 +02:00
..
v1	Merge commit '82e477b184' into glitch-soc/merge-upstream	2023-07-12 16:03:05 +02:00
v2	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-05 12:01:26 +02:00
web	Refactor formatter (#17828)	2022-03-26 02:53:34 +01:00
base_controller.rb	Fix anonymous visitors getting a session cookie on first visit (#24584)	2023-04-25 16:51:38 +02:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00