Claire aeacebb3d7 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream updated `docker/build-push-action`, and we a different config for `docker/metadata-action` so the lines directly above were different, but it's not a real conflict. Upgraded `docker/build-push-action` as upstream did. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Upstream changed the codestyle near a line we had modified to accommodate configurable character count. Kept our change.		2023-02-03 19:23:27 +01:00
..
about	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
accounts	Fix being able to spoof link verification (#20217)	2022-11-09 08:24:21 +01:00
admin	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
admin_mailer	Add support for language preferences for trending statuses and links (#18288)	2022-10-08 16:45:40 +02:00
application	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
auth	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-24 20:32:31 +01:00
authorize_interactions	Fix links to the Web UI in notifications (#19981)	2022-11-07 15:42:58 +01:00
custom_css
disputes/strikes	Fix incorrectly formatted datetime in account moderation note timestamp (#22555)	2023-01-05 13:35:28 +01:00
errors
filters
follower_accounts	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
following_accounts	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
home	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
invites
kaminari
layouts	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-14 22:34:09 +01:00
media
notification_mailer	Fix links to the Web UI in notifications (#19981)	2022-11-07 15:42:58 +01:00
oauth
privacy	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
relationships	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-14 22:34:09 +01:00
settings	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-25 17:26:38 +01:00
shared	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
shares
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-03 19:23:27 +01:00
statuses_cleanup
tags	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
user_mailer	Remove unnecessary sections from welcome e-mail (#19299)	2022-10-06 00:03:52 +02:00
well_known/host_meta