Merge remote-tracking branch 'parent/main' into upstream-20240112

.haml-lint_todo.yml

@@ -1,28 +1,16 @@
 # This configuration was generated by
 # `haml-lint --auto-gen-config`
-# on 2023-12-15 11:02:19 -0500 using Haml-Lint version 0.52.0.
+# on 2024-01-09 11:30:07 -0500 using Haml-Lint version 0.53.0.
 # The point is for the user to remove these configuration records
 # one by one as the lints are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of Haml-Lint, may require this file to be generated again.
 
 linters:
-  # Offense count: 11
+  # Offense count: 1
   LineLength:
     exclude:
       - 'app/views/admin/roles/_form.html.haml'
-      - 'app/views/auth/registrations/edit.html.haml'
-      - 'app/views/auth/registrations/new.html.haml'
-      - 'app/views/media/player.html.haml'
-      - 'app/views/settings/applications/_fields.html.haml'
-      - 'app/views/settings/imports/index.html.haml'
-      - 'app/views/settings/preferences/appearance/show.html.haml'
-      - 'app/views/settings/preferences/notifications/show.html.haml'
-      - 'app/views/settings/preferences/other/show.html.haml'
-      - 'app/views/settings/preferences/reaching/show.html.haml'
-      - 'app/views/settings/privacy/show.html.haml'
-      - 'app/views/settings/privacy_extra/show.html.haml'
-      - 'app/views/settings/profiles/show.html.haml'
 
   # Offense count: 9
   RuboCop:
@@ -32,6 +20,8 @@ linters:
   ViewLength:
     exclude:
       - 'app/views/admin/instances/show.html.haml'
+      - 'app/views/settings/preferences/appearance/show.html.haml'
+      - 'app/views/settings/preferences/other/show.html.haml'
 
   InstanceVariables:
     exclude: