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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d3e51600ddd815bab3e57cfd794ac99cf4531f82..25a30bf40099b15ac1326ca0bcccd3568322472c 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -13,13 +13,15 @@ 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/traces_controller.rb'

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

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

+    - 'app/helpers/browse_tags_helper.rb'

     - 'app/models/client_application.rb'
     - 'app/models/client_application.rb'

-    - 'app/models/notifier.rb'
+    - 'app/mailers/notifier.rb'

     - 'lib/nominatim.rb'
     - 'lib/osm.rb'
     - 'script/deliver-message'
     - 'lib/nominatim.rb'
     - 'lib/osm.rb'
     - 'script/deliver-message'


@@ -27,12 +29,12 @@ Lint/AssignmentInCondition:
 # Offense count: 4
 Lint/HandleExceptions:
   Exclude:
 # Offense count: 4
 Lint/HandleExceptions:
   Exclude:

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

 
 # Offense count: 692
 Metrics/AbcSize:
 
 # Offense count: 692
 Metrics/AbcSize:

-  Max: 280
+  Max: 283

 
 # Offense count: 40
 # Configuration parameters: CountComments, ExcludedMethods.
 
 # Offense count: 40
 # Configuration parameters: CountComments, ExcludedMethods.


@@ -48,11 +50,11 @@ Metrics/BlockNesting:
 # Offense count: 63
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
 # Offense count: 63
 # Configuration parameters: CountComments.
 Metrics/ClassLength:

-  Max: 1795
+  Max: 1627

 
 # Offense count: 72
 Metrics/CyclomaticComplexity:
 
 # Offense count: 72
 Metrics/CyclomaticComplexity:

-  Max: 20
+  Max: 23

 
 # Offense count: 691
 # Configuration parameters: CountComments.
 
 # Offense count: 691
 # Configuration parameters: CountComments.


@@ -139,9 +141,9 @@ Rails/NotNullColumn:
 # Offense count: 20
 Rails/OutputSafety:
   Exclude:
 # Offense count: 20
 Rails/OutputSafety:
   Exclude:

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

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

-    - 'app/helpers/changeset_helper.rb'
+    - 'app/helpers/changesets_helper.rb'

     - 'app/helpers/geocoder_helper.rb'
     - 'app/helpers/note_helper.rb'
     - 'app/helpers/open_graph_helper.rb'
     - 'app/helpers/geocoder_helper.rb'
     - 'app/helpers/note_helper.rb'
     - 'app/helpers/open_graph_helper.rb'


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

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

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