Merge remote-tracking branch 'upstream/pull/5335'

[rails.git] / .erb-lint.yml

diff --git a/.erb-lint.yml b/.erb-lint.yml
index 812a6f5382dc71b6a949aa1e7e45d87851674544..0c729d38f8426e5f564d2bb311ffb2f230b42b8f 100644 (file)
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -10,20 +10,20 @@ linters:
         - .rubocop.yml
       Layout/InitialIndentation:
         Enabled: false
         - .rubocop.yml
       Layout/InitialIndentation:
         Enabled: false

-      Layout/TrailingBlankLines:
+      Layout/LineLength:

         Enabled: false
         Enabled: false

-      Layout/TrailingWhitespace:
-        Enabled: false
-      Naming/FileName:
-        Enabled: false
-      Style/FrozenStringLiteralComment:
+      Layout/TrailingEmptyLines:

         Enabled: false
         Enabled: false

-      Metrics/LineLength:
+      Layout/TrailingWhitespace:

         Enabled: false
       Lint/UselessAssignment:
         Enabled: false
         Enabled: false
       Lint/UselessAssignment:
         Enabled: false

+      Naming/FileName:
+        Enabled: false

       Rails/OutputSafety:
         Enabled: false
       Rails/OutputSafety:
         Enabled: false

+      Style/FrozenStringLiteralComment:
+        Enabled: false

   SelfClosingTag:
     enabled: false
   SpaceInHtmlTag:
   SelfClosingTag:
     enabled: false
   SpaceInHtmlTag: