Claire dc68306b8e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/application.html.haml`: Conflicts due to glitch-soc's theming system. Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code. - `app/views/layouts/embedded.html.haml`: Conflicts due to glitch-soc's theming system. Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.		2023-06-18 16:14:29 +02:00
..
about
accounts	Enable Rubocop for app/views (#23874)	2023-03-05 00:33:52 +01:00
admin	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream	2023-06-10 16:48:01 +02:00
admin_mailer	Consistently use middle dot (·) instead of bullet (•) to separate items (#25248)	2023-06-02 19:58:18 +02:00
application	Add card with who invited you to join when displaying rules on sign-up (#23475)	2023-06-02 18:35:37 +02:00
auth	Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream	2023-06-18 10:36:14 +02: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 incorrect post links in strikes when the account is remote (#23611)	2023-03-15 04:14:47 +01:00
errors
filters	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-15 09:16:10 +01:00
follower_accounts
following_accounts
home
invites
kaminari	Fix missing translation in pagination gap tags (#24262)	2023-03-29 13:54:33 +02:00
layouts	Merge branch 'main' into glitch-soc/merge-upstream	2023-06-18 16:14:29 +02:00
mail_subscriptions	Add unsubscribe link to e-mails (#25378)	2023-06-12 14:22:46 +02:00
media	Merge branch 'main' into glitch-soc/merge-upstream	2023-06-18 16:14:29 +02:00
notification_mailer	Add time zone preference (#25342)	2023-06-10 03:29:37 +02:00
oauth	Consistently use middle dot (·) instead of bullet (•) to separate items (#25248)	2023-06-02 19:58:18 +02:00
privacy
relationships	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-05 20:46:56 +01:00
settings	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	2023-06-18 13:41:33 +02:00
shared	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-15 09:16:10 +01:00
shares
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-16 23:12:59 +01:00
statuses_cleanup
tags	Enable Rubocop for app/views (#23874)	2023-03-05 00:33:52 +01:00
user_mailer	Add time zone preference (#25342)	2023-06-10 03:29:37 +02:00
well_known/host_meta	Enable Rubocop for app/views (#23874)	2023-03-05 00:33:52 +01:00