Localisation updates from https://translatewiki.net.

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index aacaf2d53a2446d7fa3df2fdaefe9212ee5fbb80..7d2df0445445ab5f25f560eeb0cdea58a474f0c2 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,7 +1,11 @@
 inherit_from: .rubocop_todo.yml
 
 inherit_from: .rubocop_todo.yml
 

+require:
+  - rubocop-performance
+  - rubocop-rails
+

 AllCops:
 AllCops:

-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5

 
 Rails:
   Enabled: true
 
 Rails:
   Enabled: true


@@ -15,6 +19,10 @@ Lint/PercentStringArray:
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/site_controller.rb'
 
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/site_controller.rb'
 

+Metrics/BlockLength:
+  Exclude:
+    - 'config/routes.rb'
+

 Naming/FileName:
   Exclude:
     - 'script/deliver-message'
 Naming/FileName:
   Exclude:
     - 'script/deliver-message'


@@ -30,6 +38,9 @@ Rails/ApplicationRecord:
 Rails/CreateTableWithTimestamps:
   Enabled: false
 
 Rails/CreateTableWithTimestamps:
   Enabled: false
 

+Rails/FindEach:
+  Enabled: false
+

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


@@ -42,7 +53,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


@@ -53,10 +64,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