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

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

diff --git a/.erb-lint.yml b/.erb-lint.yml
index 29057feb246052d4a2d8f5b4b70d360a6c16e479..812a6f5382dc71b6a949aa1e7e45d87851674544 100644 (file)
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -1,9 +1,8 @@
 ---
 linters:
 ---
 linters:

-  SelfClosingTag:
-    enabled: false
-  SpaceInHtmlTag:
-    enabled: false # TODO
+  AllowedScriptType:
+    enabled: true
+    disallow_inline_scripts: true

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


@@ -25,33 +24,9 @@ linters:
         Enabled: false
       Rails/OutputSafety:
         Enabled: false
         Enabled: false
       Rails/OutputSafety:
         Enabled: false

-      Style/StringLiterals:
-        Enabled: false # TODO
-      Style/BracesAroundHashParameters:
-        Enabled: false # TODO
-      Rails/DynamicFindBy:
-        Enabled: false # TODO
-      Style/AndOr:
-        Enabled: false # TODO
-      Style/WordArray:
-        Enabled: false # TODO
-      Style/MethodCallWithoutArgsParentheses:
-        Enabled: false # TODO
-      Layout/LeadingBlankLines:
-        Enabled: false # TODO
-      Style/NestedParenthesizedCalls:
-        Enabled: false # TODO
-      Rails/LinkToBlank:
-        Enabled: false # TODO
-      Style/HashSyntax:
-        Enabled: false # TODO
-      Style/SymbolProc:
-        Enabled: false # TODO
-      Style/Not:
-        Enabled: false # TODO
-      Style/NegatedIf:
-        Enabled: false # TODO
-      Style/ConditionalAssignment:
-        Enabled: false # TODO
+  SelfClosingTag:
+    enabled: false
+  SpaceInHtmlTag:
+    enabled: true

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