Claire 3e3fc8398b Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/trends/links/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/links/preview_card_providers/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/statuses/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/tags/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes.		2022-03-02 20:48:27 +01:00
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-02 20:48:27 +01:00
v2	Merge branch 'main' into glitch-soc/merge-upstream	2021-04-20 12:17:14 +02:00
web	Add notifications for new sign-ups (#16953)	2022-02-23 16:45:22 +01:00
base_controller.rb	Change authorized applications page (#17656)	2022-03-01 16:48:58 +01:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00