Claire 2d4ff8f6ed Merge commit 'f445d33fd6aa492df319f4cc4efbd255d7a84f0e' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Upstream split some `simple_form` arguments across multiple lines. One of the arguments in glitch-soc was different. Split as upstream's did, keeping our different limit argument. - `app/views/admin/settings/appearance/show.html.haml`: Upstream split some `simple_form` arguments across multiple lines. Glitch-soc had a different field because of the different theming system. Kept glitch-soc's definition of that form field.		2024-03-15 12:43:59 +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 'f445d33fd6aa492df319f4cc4efbd255d7a84f0e' into glitch-soc/merge-upstream	2024-03-15 12:43:59 +01:00
admin_mailer	Automatically switch from open to approved registrations in absence of moderators (#29318)	2024-02-22 20:45:40 +01:00
application	Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream	2024-03-01 18:34:48 +01:00
auth	Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream	2024-03-11 17:29:07 +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	Fix haml-lint `LineLength` cops in app/views/admin (#28680)	2024-03-15 11:19:00 +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	Fix missing translation in pagination gap tags (#24262)	2023-03-29 13:54:33 +02:00
layouts	Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream	2024-01-17 18:32:15 +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	Update follow and follow_request emails (#28755)	2024-01-17 14:37:04 +00:00
oauth	Add `Account#unavailable?` and `Account#permanently_unavailable?` aliases (#28053)	2023-11-30 15:43:26 +00:00
privacy	…
redirects	Add confirmation when redirecting logged-out requests to permalink (#27792)	2024-01-24 10:49:19 +00:00
relationships	Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream	2024-02-26 17:43:16 +01:00
remote_interaction_helper	Fix interaction modal being broken because of glitch-soc's theming system	2023-07-30 16:45:50 +02:00
settings	Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream	2024-03-11 17:29:07 +01:00
shared	Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream	2024-01-17 18:32:15 +01:00
shares	…
statuses	Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream	2023-10-25 19:59:17 +02:00
statuses_cleanup	Fix haml-lint `LineLength` cops in app/views/admin (#28680)	2024-03-15 11:19:00 +00:00
tags	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
user_mailer	New welcome email (#28883)	2024-03-01 12:16:53 +00:00
well_known/host_meta	Rubocop fix: `Perfomance/UnfreezeString` (#26217)	2023-07-28 23:11:05 +02:00
.rubocop.yml	Solve simplest haml-lint `Rubocop` lints (#27529)	2023-10-25 12:38:01 +00:00