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

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

diff --git a/.erb-lint.yml b/.erb-lint.yml
index c78bcd178af4db1f68fcd306c7dbc853908e7e1b..0c729d38f8426e5f564d2bb311ffb2f230b42b8f 100644 (file)
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -1,9 +1,8 @@
 ---
 linters:
 ---
 linters:

-  SelfClosingTag:
-    enabled: false
-  SpaceInHtmlTag:
+  AllowedScriptType:

     enabled: true
     enabled: true

+    disallow_inline_scripts: true

   Rubocop:
     enabled: true
     rubocop_config:
   Rubocop:
     enabled: true
     rubocop_config:


@@ -11,19 +10,23 @@ linters:
         - .rubocop.yml
       Layout/InitialIndentation:
         Enabled: false
         - .rubocop.yml
       Layout/InitialIndentation:
         Enabled: false

-      Layout/TrailingBlankLines:
+      Layout/LineLength:

         Enabled: false
         Enabled: false

-      Layout/TrailingWhitespace:
+      Layout/TrailingEmptyLines:

         Enabled: false
         Enabled: false

-      Naming/FileName:
-        Enabled: false
-      Style/FrozenStringLiteralComment:
-        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:
+    enabled: true

 exclude:
   - '**/vendor/**'
 exclude:
   - '**/vendor/**'