Claire b135b6ba8f Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Conflict caused by glitch-soc having a different file size limit constant name. Updated like upstream did while keeping glitch-soc's constant name.		2023-12-19 21:24:01 +01:00
..
about	…
accounts	Avoid unnecessary i-var for account rss page url generation (#28092)	2023-11-28 08:19:08 +00:00
admin	Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream	2023-12-19 21:24:01 +01:00
admin_mailer	Use `admin_mailer` layout with initial salutation (#28085)	2023-11-28 07:41:26 +00:00
application	…
auth	Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream	2023-12-10 18:05:02 +01:00
custom_css	…
disputes/strikes	Fix haml-lint `UnnecessaryStringOutput` for views (#27531)	2023-10-25 12:01:00 +00:00
errors	Use `ENV.fetch` in views, fixes rubocop haml-lint issue (#27527)	2023-10-24 09:30:14 +00:00
filters	Change alt text to empty string for avatars (#21875)	2023-11-07 21:46:08 +00:00
follower_accounts	…
following_accounts	…
home	…
invites	Fix haml-lint `InstanceVariables` rule for invites/_form (#26064)	2023-09-28 15:40:28 +02:00
kaminari	…
layouts	Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream	2023-12-19 21:24:01 +01:00
mail_subscriptions	…
media	…
notification_mailer	Fix haml-lint `UnnecessaryStringOutput` for views (#27531)	2023-10-25 12:01:00 +00:00
oauth	Remove unused `#error_explanation` id from error partials (#27536)	2023-10-25 07:12:32 +00:00
privacy	…
relationships	Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream	2023-10-17 20:59:18 +02:00
remote_interaction_helper	…
settings	Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream	2023-12-10 18:05:02 +01:00
shared	Remove redundant asset preload (#2488)	2023-12-02 14:54:26 +01:00
shares	…
statuses	Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream	2023-10-25 19:59:17 +02:00
statuses_cleanup	Solve simplest haml-lint `Rubocop` lints (#27529)	2023-10-25 12:38:01 +00:00
tags	…
user_mailer	Fix haml-lint `UnnecessaryStringOutput` for views (#27531)	2023-10-25 12:01:00 +00:00
well_known/host_meta	…
.rubocop.yml	Solve simplest haml-lint `Rubocop` lints (#27529)	2023-10-25 12:38:01 +00:00