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

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

diff --git a/.erb-lint.yml b/.erb-lint.yml
index a002cdafa46b60535e272a61f25c6f4dafc8998a..0c729d38f8426e5f564d2bb311ffb2f230b42b8f 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:


@@ -11,61 +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:
-        Enabled: false
-      Naming/FileName:
-        Enabled: false
-      Style/FrozenStringLiteralComment:
+      Layout/TrailingEmptyLines:

         Enabled: false
         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/StringLiterals:
-        Exclude: # TODO
-          - app/views/browse/*
-          - app/views/changesets/*
-          - app/views/changeset_comments/*
-          - app/views/diary_entries/*
-          - app/views/geocoder/*
-          - app/views/issues/*
-          - app/views/layouts/*
-          - app/views/messages/*
-          - app/views/notes/*
-          - app/views/notifier/*
-          - app/views/oauth/*
-          - app/views/oauth_clients/*
-          - app/views/redactions/*
-          - app/views/reports/*
-          - app/views/site/*
-          - app/views/traces/*
-          - app/views/user_blocks/*
-          - app/views/users/*
-      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/SymbolProc:
-        Enabled: false # TODO
-      Style/Not:
-        Enabled: false # TODO
-      Style/NegatedIf:
-        Enabled: false # TODO
-      Style/ConditionalAssignment:
-        Enabled: false # TODO
+      Style/FrozenStringLiteralComment:
+        Enabled: false
+  SelfClosingTag:
+    enabled: false
+  SpaceInHtmlTag:
+    enabled: true

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