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

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

diff --git a/.erb-lint.yml b/.erb-lint.yml
index 76dfdcff802dc6acee5103269a968fda0fd4b3fb..7737aee0634b0cdb6ee70497740f16700daa6029 100644 (file)
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -1,9 +1,8 @@
 ---
 linters:
-  SelfClosingTag:
-    enabled: false
-  SpaceInHtmlTag:
-    enabled: false # TODO
+  AllowedScriptType:
+    enabled: true
+    disallow_inline_scripts: true
   Rubocop:
     enabled: true
     rubocop_config:
@@ -11,7 +10,9 @@ linters:
         - .rubocop.yml
       Layout/InitialIndentation:
         Enabled: false
-      Layout/TrailingBlankLines:
+      Layout/LineLength:
+        Enabled: false
+      Layout/TrailingEmptyLines:
         Enabled: false
       Layout/TrailingWhitespace:
         Enabled: false
@@ -19,21 +20,13 @@ linters:
         Enabled: false
       Style/FrozenStringLiteralComment:
         Enabled: false
-      Metrics/LineLength:
-        Enabled: false
       Lint/UselessAssignment:
         Enabled: false
       Rails/OutputSafety:
         Enabled: false
-      Rails/DynamicFindBy:
-        Enabled: false # TODO
-      Style/WordArray:
-        Enabled: false # TODO
-      Layout/LeadingBlankLines:
-        Enabled: false # TODO
-      Rails/LinkToBlank:
-        Enabled: false # TODO
-      Style/ConditionalAssignment:
-        Enabled: false # TODO
+  SelfClosingTag:
+    enabled: false
+  SpaceInHtmlTag:
+    enabled: true
 exclude:
   - '**/vendor/**'