Update to iD v2.15.0

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 35107e9b9b2ea961b3949d10ec50b4caef6ba16d..f989d393d21b145266974809a700885a9834f15e 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -13,9 +13,10 @@ Lint/AssignmentInCondition:
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'

+    - 'app/controllers/api/traces_controller.rb'

     - 'app/controllers/traces_controller.rb'
     - 'app/controllers/users_controller.rb'
     - 'app/controllers/traces_controller.rb'
     - 'app/controllers/users_controller.rb'

-    - 'app/controllers/user_preferences_controller.rb'
+    - 'app/controllers/api/user_preferences_controller.rb'

     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_helper.rb'
     - 'app/helpers/browse_tags_helper.rb'
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_helper.rb'
     - 'app/helpers/browse_tags_helper.rb'


@@ -28,7 +29,7 @@ Lint/AssignmentInCondition:
 # Offense count: 4
 Lint/HandleExceptions:
   Exclude:
 # Offense count: 4
 Lint/HandleExceptions:
   Exclude:

-    - 'app/controllers/amf_controller.rb'
+    - 'app/controllers/api/amf_controller.rb'

     - 'app/controllers/users_controller.rb'
 
 # Offense count: 692
     - 'app/controllers/users_controller.rb'
 
 # Offense count: 692


@@ -72,7 +73,7 @@ Metrics/ParameterLists:
 
 # Offense count: 72
 Metrics/PerceivedComplexity:
 
 # Offense count: 72
 Metrics/PerceivedComplexity:

-  Max: 23
+  Max: 25

 
 # Offense count: 6
 Naming/AccessorMethodName:
 
 # Offense count: 6
 Naming/AccessorMethodName:


@@ -99,6 +100,11 @@ Naming/PredicateName:
     - 'app/models/user.rb'
     - 'lib/classic_pagination/pagination.rb'
 
     - 'app/models/user.rb'
     - 'lib/classic_pagination/pagination.rb'
 

+# Disabled pending merge of fix for:
+# https://github.com/rubocop-hq/rubocop/issues/6943
+Rails/ActiveRecordOverride:
+  Enabled: false
+

 # Offense count: 6
 # Configuration parameters: Database, Include.
 # SupportedDatabases: mysql, postgresql
 # Offense count: 6
 # Configuration parameters: Database, Include.
 # SupportedDatabases: mysql, postgresql


@@ -178,7 +184,7 @@ Style/FrozenStringLiteralComment:
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Exclude:
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Exclude:

-    - 'app/controllers/ways_controller.rb'
+    - 'app/controllers/api/ways_controller.rb'

 
 # Offense count: 70
 # Cop supports --auto-correct.
 
 # Offense count: 70
 # Cop supports --auto-correct.