Fix whitespace in locale file

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 5e7be9797e8ebdef5de86cb4a3ff65acdf264cee..24d57fb37cc0b354c71674e00c8a6f9671bbdf6b 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,26 +1,5 @@
 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
 
@@ -30,6 +9,7 @@ Layout/ExtraSpacing:
 Lint/PercentStringArray:
   Exclude:
     - 'config/initializers/secure_headers.rb'
+    - 'app/controllers/application_controller.rb'
     - 'app/controllers/site_controller.rb'
 
 Naming/FileName:
@@ -38,6 +18,9 @@ Naming/FileName:
     - 'script/locale/reload-languages'
     - 'script/update-spam-blocks'
 
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+
 Rails/ApplicationRecord:
   Enabled: false
 
@@ -80,6 +63,11 @@ Style/HashSyntax:
     - 'lib/tasks/testing.rake'
     - 'config/initializers/wrap_parameters.rb'
 
+Style/MixinUsage:
+  Exclude:
+    - 'bin/setup'
+    - 'bin/update'
+
 Style/StringLiterals:
   EnforcedStyle: double_quotes