Claire 3465d39494 Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Upstream removed a helper, textually adjacent to a glitch-soc-only one. Not really a conflict. Removed the helper as upstream did. - `app/views/layouts/embedded.html.haml`: Conflicts due to theming system. Adapted upstream's change to our theming system. - `app/views/statuses/_simple_status.html.haml`: Removed upstream, but we had local changes. Removed as upstream did.		2024-09-12 20:05:08 +02:00
..
about	…
accounts	…
admin	Merge commit 'a27f7f4e561c9d2fe21d984059603d2f500c005b' into glitch-soc/merge-upstream	2024-09-12 17:22:06 +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	Remove `fa_` prefix from status visibility icon method (#31846)	2024-09-11 07:47:16 +00:00
follower_accounts	…
following_accounts	…
home	…
invites	Convert invites controller spec to system/request specs (#31755)	2024-09-05 11:54:27 +00:00
kaminari	Migrate fontawesome->material in more views (#31360)	2024-08-20 11:52:45 +00:00
layouts	Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream	2024-09-12 20:05:08 +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	Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream	2024-09-06 19:25:31 +02:00
notification_mailer	…
oauth	Direct link to each authorized_application entry with html anchor (#31677)	2024-09-05 09:48:42 +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 '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream	2024-09-12 12:09:21 +02:00
severed_relationships	…
shared	…
shares	…
statuses	Change embedded posts to use web UI (#31766)	2024-09-12 09:41:19 +00: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	…