Claire 8743b1ea40 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
..
about	Change CAPTCHA handling to be only on email verification	2022-01-25 23:56:57 +01:00
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
admin	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-02 20:48:27 +01:00
admin_mailer	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
application	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
auth	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-02 18:02:48 +01:00
authorize_interactions
directories	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
disputes/strikes	Change old moderation strikes to be displayed in a separate page (#17566)	2022-03-01 19:37:47 +01:00
errors
filters
follower_accounts
following_accounts
home
invites
kaminari
layouts	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-02 18:02:48 +01:00
media
notification_mailer	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
oauth	Change visual separation of applications in authorized apps list (#17686)	2022-03-02 20:28:25 +01:00
public_timelines
relationships	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
remote_follow
remote_interaction
settings	Disable notifications for trending links and trending statuses by default	2022-02-26 10:46:26 +01:00
shared
shares
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-17 10:58:44 +01:00
statuses_cleanup	Add feature to automatically delete old toots (#16529)	2021-08-09 23:11:50 +02:00
tags
user_mailer	Add appeals (#17364)	2022-02-14 21:27:53 +01:00
well_known/host_meta