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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 5e7be9797e8ebdef5de86cb4a3ff65acdf264cee..b33f9046cb87c117925cc8e290392f2021aae270 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,25 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
 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'
+  TargetRubyVersion: 2.3

 
 Rails:
   Enabled: true
 
 Rails:
   Enabled: true


@@ -30,6 +12,7 @@ Layout/ExtraSpacing:
 Lint/PercentStringArray:
   Exclude:
     - 'config/initializers/secure_headers.rb'
 Lint/PercentStringArray:
   Exclude:
     - 'config/initializers/secure_headers.rb'

+    - 'app/controllers/application_controller.rb'

     - 'app/controllers/site_controller.rb'
 
 Naming/FileName:
     - 'app/controllers/site_controller.rb'
 
 Naming/FileName:


@@ -38,12 +21,18 @@ Naming/FileName:
     - 'script/locale/reload-languages'
     - 'script/update-spam-blocks'
 
     - 'script/locale/reload-languages'
     - 'script/update-spam-blocks'
 

+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+

 Rails/ApplicationRecord:
   Enabled: false
 
 Rails/CreateTableWithTimestamps:
   Enabled: false
 
 Rails/ApplicationRecord:
   Enabled: false
 
 Rails/CreateTableWithTimestamps:
   Enabled: false
 

+Rails/FindEach:
+  Enabled: false
+

 Rails/HasManyOrHasOneDependent:
   Enabled: false
 
 Rails/HasManyOrHasOneDependent:
   Enabled: false
 


@@ -56,7 +45,7 @@ Rails/InverseOf:
 Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/*.rb'
 Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/*.rb'

-    - 'app/controllers/user_controller.rb'
+    - 'app/controllers/users_controller.rb'

 
 Style/BracesAroundHashParameters:
   EnforcedStyle: context_dependent
 
 Style/BracesAroundHashParameters:
   EnforcedStyle: context_dependent


@@ -67,10 +56,6 @@ Style/FormatStringToken:
 Style/IfInsideElse:
   Enabled: false
 
 Style/IfInsideElse:
   Enabled: false
 

-Style/GlobalVars:
-  Exclude:
-    - 'lib/quad_tile/extconf.rb'
-

 Style/GuardClause:
   Enabled: false
 
 Style/GuardClause:
   Enabled: false
 


@@ -80,6 +65,11 @@ Style/HashSyntax:
     - 'lib/tasks/testing.rake'
     - 'config/initializers/wrap_parameters.rb'
 
     - 'lib/tasks/testing.rake'
     - 'config/initializers/wrap_parameters.rb'
 

+Style/MixinUsage:
+  Exclude:
+    - 'bin/setup'
+    - 'bin/update'
+

 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes