Claire 18556d3e9b Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Upstream refactored some helpers and moved them in another file. Not a real conflict, but glitch-soc had adjacent glitch-only definitions. Kept glitch-soc definitions where they are and moved upstream ones as upstream did.		2024-08-22 19:54:20 +02:00
..
v1	Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream	2024-08-22 19:54:20 +02:00
v2	Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream	2024-08-09 17:15:32 +02:00
v2_alpha	Add option to request partial accounts in grouped notifications API (#31299)	2024-08-06 12:09:35 +00:00
web	Improve spec coverage for api/web/push_subscriptions controller (#27858)	2023-11-15 13:14:51 +00:00
base_controller.rb	Add endpoints for unread notifications count (#31191)	2024-07-30 08:39:11 +00:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00