Claire 0d69cc068c Merge commit '26f25ef4bafd5ad84d03d8cb7ad0d868360175e5' into glitch-soc/stable-4.3 ... Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image. Removed the styling as upstream did. - `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-12-02 21:49:12 +01:00
..
about	Fix titles being escaped twice (#32889)	2024-12-02 16:20:32 +01:00
accounts	Fix titles being escaped twice (#32889)	2024-12-02 16:20:32 +01:00
admin	Merge commit '26f25ef4bafd5ad84d03d8cb7ad0d868360175e5' into glitch-soc/stable-4.3	2024-12-02 21:49:12 +01:00
admin_mailer	…
application	Merge commit 'f7aab0cc2ff47337021d50ed52428abcb7a9b518' into glitch-soc/backports-4.3	2024-10-18 17:19:57 +02:00
auth	Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream	2024-09-29 11:06:09 +02:00
custom_css	…
disputes/strikes	Use previously extracted model constants in form `maxlength` attributes (#32113)	2024-09-27 08:21:27 +00:00
errors	…
filters	Remove `fa_` prefix from status visibility icon method (#31846)	2024-09-11 07:47:16 +00:00
follower_accounts	…
following_accounts	…
home	…
invites	Add `copyable_input` helper method to wrap shared options (#32119)	2024-10-04 17:48:03 +02: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	…
media	Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream	2024-09-06 19:25:31 +02:00
notification_mailer	…
oauth	Add `copyable_input` helper method to wrap shared options (#32119)	2024-10-04 17:48:03 +02:00
privacy	Fix titles being escaped twice (#32889)	2024-12-02 16:20:32 +01:00
redirects	Move redirect/base body class to view (#31796)	2024-09-12 13:31:50 +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 '26f25ef4bafd5ad84d03d8cb7ad0d868360175e5' into glitch-soc/stable-4.3	2024-12-02 21:49:12 +01:00
severed_relationships	Wrap datetime in `time` element with attrs (#32177)	2024-10-04 17:48:03 +02:00
shared	…
shares	…
statuses	Fix titles being escaped twice (#32889)	2024-12-02 16:20:32 +01:00
statuses_cleanup	…
tags	…
user_mailer	Fix broken i18n in text welcome mailer tags area (#32571)	2024-10-18 15:49:26 +02:00
well_known/host_meta	…
.rubocop.yml	…