X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8df838bf09d95282ba29ddde8b504e0affc5f06e..d0e7baf48bf812a5c000c1e8d47a6fb9737d4d87:/.rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 9d9ce40b0..5db1a3104 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,32 +3,36 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   TargetRubyVersion: 2.3
 
-Layout/AlignParameters:
-  Exclude:
-    - '**/metadata.rb'
-
 Layout/ExtraSpacing:
   AllowForAlignment: true
 
 Layout/IndentHeredoc:
   EnforcedStyle: squiggly
 
-Naming/FileName:
-  Exclude:
-    - 'cookbooks/trac/files/default/trac-authenticate'
-    - 'cookbooks/planet/files/default/replication-bin/replicate-changesets'
-    - 'cookbooks/*/templates/*/*.erb'
-    - 'hooks/*'
-    - 'roles/*.rb'
-
-Style/FrozenStringLiteralComment:
-  EnforcedStyle: never
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
 
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
+Style/NumericPredicate:
+  EnforcedStyle: predicate
+
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%i': '[]'
+    '%I': '[]'
+    '%w': '[]'
+    '%W': '[]'
+
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 Style/SymbolArray:
   EnforcedStyle: brackets
+
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+
+Style/TrailingCommaInHashLiteral:
+  Enabled: false