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

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

diff --git a/.erb-lint.yml b/.erb-lint.yml
index 7737aee0634b0cdb6ee70497740f16700daa6029..0c729d38f8426e5f564d2bb311ffb2f230b42b8f 100644 (file)
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -16,14 +16,14 @@ linters:
         Enabled: false
       Layout/TrailingWhitespace:
         Enabled: false
         Enabled: false
       Layout/TrailingWhitespace:
         Enabled: false

-      Naming/FileName:
-        Enabled: false
-      Style/FrozenStringLiteralComment:
-        Enabled: false

       Lint/UselessAssignment:
         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: