X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5d3ecffa28510c867665001a7615559a185869c6..333113b8e11004903577507084ecfba85b8f7f53:/.rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index e99b88edc..477b2ab02 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,11 +1,29 @@
 inherit_from: .rubocop_todo.yml
 
+AllCops:
+  Include:
+    - '**/*.gemspec'
+    - '**/*.podspec'
+    - '**/*.jbuilder'
+    - '**/*.rake'
+    - '**/*.opal'
+    - '**/config.ru'
+    - '**/Gemfile'
+    - '**/Rakefile'
+    - '**/Capfile'
+    - '**/Guardfile'
+    - '**/Podfile'
+    - '**/Thorfile'
+    - '**/Vagrantfile'
+    - '**/Berksfile'
+    - '**/Cheffile'
+    - '**/Vagabondfile'
+    - '**/Fastfile'
+    - '**/*.builder'
+
 Rails:
   Enabled: true
 
-Performance/RedundantMerge:
-  Enabled: false
-
 Style/BracesAroundHashParameters:
   EnforcedStyle: context_dependent
 
@@ -37,6 +55,10 @@ Style/HashSyntax:
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
-Style/WordArray:
+Rails/HttpPositionalArguments:
+  Enabled: false
+
+Rails/SkipsModelValidations:
   Exclude:
-    - 'test/models/message_test.rb'
+    - 'db/migrate/*.rb'
+    - 'app/controllers/user_controller.rb'