Claire 60298af3c4 Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/application.html.haml`: Upstream changed how the `inert.css` file is included. The conflict is caused by glitch-soc's theming system. Ported the upstream change. Additional changes: - `config/webpack/shared.js`: bypass glitch-soc's theming system for `inert` pack.		2024-01-15 20:01:36 +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 '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream	2024-01-11 20:15:19 +01:00
admin_mailer	Use `admin_mailer` layout with initial salutation (#28085)	2023-11-28 07:41:26 +00:00
application	…
auth	Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream	2024-01-11 13:17:13 +01:00
custom_css	Spec coverage for custom css endpoint (#28706)	2024-01-12 09:19:25 +00:00
disputes/strikes	Add coverage/bugfix for invalid appeal submission (#28703)	2024-01-12 09:21:00 +00:00
errors	Use `ENV.fetch` in views, fixes rubocop haml-lint issue (#27527)	2023-10-24 09:30:14 +00:00
filters	Extract helper methods for labels from filters/_filter_fields (#27574)	2023-11-29 10:02:59 +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 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream	2024-01-15 20:01:36 +01:00
mail_subscriptions	Fix `LineLength` haml-lint in `t` usage (#28686)	2024-01-11 09:32:32 +00:00
media	Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream	2024-01-11 13:17:13 +01:00
notification_mailer	Fix haml-lint `UnnecessaryStringOutput` for views (#27531)	2023-10-25 12:01:00 +00:00
oauth	Add `Account#unavailable?` and `Account#permanently_unavailable?` aliases (#28053)	2023-11-30 15:43:26 +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 '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream	2024-01-11 20:15:19 +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 `LineLength` haml-lint in `t` usage (#28686)	2024-01-11 09:32:32 +00:00
well_known/host_meta	…
.rubocop.yml	Solve simplest haml-lint `Rubocop` lints (#27529)	2023-10-25 12:38:01 +00:00