This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire 42a0898f16 Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because glitch-soc does not have a theme selector here.		2023-06-10 18:42: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 '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream	2023-06-10 16:22:14 +02:00
authorize_interactions	…
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	Switch to using a `common` runtime chunk rather than `locales`	2023-06-10 17:43:13 +02:00
media	Switch to using a `common` runtime chunk rather than `locales`	2023-06-10 17:43:13 +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 '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream	2023-06-10 18:42:29 +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