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

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

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

-      Layout/TrailingBlankLines:
+      Layout/LineLength:
+        Enabled: false
+      Layout/TrailingEmptyLines:

         Enabled: false
       Layout/TrailingWhitespace:
         Enabled: false
         Enabled: false
       Layout/TrailingWhitespace:
         Enabled: false


@@ -18,8 +20,6 @@ linters:
         Enabled: false
       Style/FrozenStringLiteralComment:
         Enabled: false
         Enabled: false
       Style/FrozenStringLiteralComment:
         Enabled: false

-      Metrics/LineLength:
-        Enabled: false

       Lint/UselessAssignment:
         Enabled: false
       Rails/OutputSafety:
       Lint/UselessAssignment:
         Enabled: false
       Rails/OutputSafety: