Claire 6374937147 Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream ... Conflicts: - `app/models/trends/statuses.rb`: Upstream added a date restriction to trendable posts, while glitch-soc had slightly different conditions. Added the date restriction to glitch-soc's conditions.		2024-11-24 16:46:28 +01:00
..
about	Fix titles being escaped twice (#32889)	2024-11-14 13:28:00 +00:00
accounts	Fix titles being escaped twice (#32889)	2024-11-14 13:28:00 +00:00
admin	Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream	2024-11-24 16:46:28 +01:00
admin_mailer	…
application	Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream	2024-11-03 20:51:58 +01:00
auth	Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream	2024-09-29 11:06:09 +02:00
custom_css	…
disputes/strikes	Fix recently-broken admin interface buttons (#32240)	2024-10-03 16:12:15 +00:00
errors	…
filters	Remove remnants of embed views (#32419)	2024-11-16 20:48:10 +00:00
follower_accounts	…
following_accounts	…
home	…
invites	Add `copyable_input` helper method to wrap shared options (#32119)	2024-10-02 14:45:54 +00:00
kaminari	…
layouts	…
mail_subscriptions	…
media	…
notification_mailer	Mailer header partial access cleanup (#32585)	2024-10-28 13:41:56 +00:00
oauth	Add `copyable_input` helper method to wrap shared options (#32119)	2024-10-02 14:45:54 +00:00
privacy	Fix titles being escaped twice (#32889)	2024-11-14 13:28:00 +00:00
redirects	…
relationships	Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream	2024-11-24 16:46:28 +01:00
remote_interaction_helper	…
settings	Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream	2024-11-15 18:44:32 +01:00
severed_relationships	Wrap datetime in `time` element with attrs (#32177)	2024-10-01 12:45:58 +00:00
shared	Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream	2024-11-15 18:44:32 +01:00
shares	…
statuses	Fix titles being escaped twice (#32889)	2024-11-14 13:28:00 +00:00
statuses_cleanup	…
tags	…
user_mailer	Mailer header partial access cleanup (#32585)	2024-10-28 13:41:56 +00:00
well_known/host_meta	…
.rubocop.yml	…