Claire 395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. Ported upstream's change.		2024-06-17 18:30:28 +02:00
..
about	…
accounts	…
admin	Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream	2024-06-17 18:30:28 +02:00
admin_mailer	Fix string interpolation for software updates admin mailer (#30035)	2024-04-23 12:54:52 +00:00
application	Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream	2024-05-01 18:42:26 +02:00
auth	Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream	2024-06-17 18:30:28 +02:00
custom_css	…
disputes/strikes	…
errors	Use existing config access to `local_domain` value (#30509)	2024-06-03 09:15:58 +00:00
filters	Convert `form_for` -> `form_with` in views (#30700)	2024-06-14 09:54:22 +00:00
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream	2024-06-17 18:30:28 +02:00
mail_subscriptions	Migrate `form_tag` to `form_with` in admin and auth views (#30692)	2024-06-14 09:49:10 +00:00
media	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
notification_mailer	…
oauth	Migrate `form_tag` to `form_with` in admin and auth views (#30692)	2024-06-14 09:49:10 +00:00
privacy	…
redirects	Add `noindex` meta tag and `rel=canonical` link to redirect interstitials (#30651)	2024-06-11 15:29:45 +00:00
relationships	Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream	2024-06-17 18:30:28 +02:00
remote_interaction_helper	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
settings	Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream	2024-05-16 19:30:10 +02:00
severed_relationships	…
shared	Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream	2024-05-01 19:16:48 +02:00
shares	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
statuses	…
statuses_cleanup	…
tags	…
user_mailer	…
well_known/host_meta	…
.rubocop.yml	…