Claire 0cec9077a4 Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream ... Conflicts: - `spec/requests/api/v2/instance_spec.rb`: Upstream added a test for a new attribute, next to a line we modified in glitch-soc because of a different default value. Updated as upstream's did, keeping glitch-soc's default value.		2024-08-21 18:44:21 +02:00
..
about	…
accounts	…
admin	Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream	2024-08-20 18:31:50 +02:00
admin_mailer	…
application	Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream	2024-08-20 18:31:50 +02:00
auth	Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream	2024-08-20 18:31:50 +02:00
custom_css	…
disputes/strikes	Migrate fontawesome->material in more views (#31360)	2024-08-20 11:52:45 +00:00
errors	Use existing config access to `local_domain` value (#30509)	2024-06-03 09:15:58 +00:00
filters	Migrate fontawesome->material in more views (#31360)	2024-08-20 11:52:45 +00:00
follower_accounts	…
following_accounts	…
home	…
invites	Migrate fontawesome->material in more views (#31360)	2024-08-20 11:52:45 +00:00
kaminari	Migrate fontawesome->material in more views (#31360)	2024-08-20 11:52:45 +00:00
layouts	Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream	2024-08-20 18:31:50 +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	…
notification_mailer	…
oauth	Migrate fontawesome->material in more views (#31360)	2024-08-20 11:52:45 +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 '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream	2024-08-20 18:31:50 +02:00
remote_interaction_helper	…
settings	Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream	2024-08-20 18:31:50 +02:00
severed_relationships	…
shared	Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream	2024-05-01 19:16:48 +02:00
shares	…
statuses	Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream	2024-08-21 18:44:21 +02:00
statuses_cleanup	Disable irrelevant fields unless cleanup is enabled (#26562)	2024-08-04 08:57:46 +00:00
tags	…
user_mailer	…
well_known/host_meta	…
.rubocop.yml	…