Merge remote-tracking branch 'openstreetmap/pull/1401'

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 975457d9572a6670386e154be340781a44913299..477b2ab02c152e3af3488a62eb8c0b79040d1db3 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,6 +2,23 @@ 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:
@@ -40,3 +57,8 @@ Style/StringLiterals:
 
 Rails/HttpPositionalArguments:
   Enabled: false
+
+Rails/SkipsModelValidations:
+  Exclude:
+    - 'db/migrate/*.rb'
+    - 'app/controllers/user_controller.rb'