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

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

diff --git a/.erb-lint.yml b/.erb-lint.yml
index 29057feb246052d4a2d8f5b4b70d360a6c16e479..f1da5efb3c5bb0ccbaf764ecb9b61c7f6483a38b 100644 (file)
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -26,25 +26,36 @@ linters:
       Rails/OutputSafety:
         Enabled: false
       Style/StringLiterals:
       Rails/OutputSafety:
         Enabled: false
       Style/StringLiterals:

-        Enabled: false # TODO
-      Style/BracesAroundHashParameters:
-        Enabled: false # TODO
+        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/traces/*
+          - app/views/user_blocks/*
+          - app/views/users/*

       Rails/DynamicFindBy:
         Enabled: false # TODO
       Style/AndOr:
         Enabled: false # TODO
       Style/WordArray:
         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
       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:
       Style/SymbolProc:
         Enabled: false # TODO
       Style/Not: