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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 653d7e1575bb954e7d885012e589aed088543e78..35107e9b9b2ea961b3949d10ec50b4caef6ba16d 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
 # This configuration was generated by
 # `rubocop --auto-gen-config`

-# on 2018-06-19 09:02:55 +0100 using RuboCop version 0.57.2.
+# on 2018-09-19 14:24:02 +0100 using RuboCop version 0.58.2.

 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new


@@ -14,12 +14,13 @@ Lint/AssignmentInCondition:
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'
     - 'app/controllers/traces_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'
     - 'app/controllers/traces_controller.rb'

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

     - 'app/controllers/user_preferences_controller.rb'
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_helper.rb'
     - 'app/controllers/user_preferences_controller.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'


@@ -28,16 +29,17 @@ Lint/AssignmentInCondition:
 Lint/HandleExceptions:
   Exclude:
     - 'app/controllers/amf_controller.rb'
 Lint/HandleExceptions:
   Exclude:
     - 'app/controllers/amf_controller.rb'

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

 
 

-# Offense count: 690
+# Offense count: 692

 Metrics/AbcSize:
 Metrics/AbcSize:

-  Max: 280
+  Max: 283

 
 

-# Offense count: 41
+# Offense count: 40

 # Configuration parameters: CountComments, ExcludedMethods.
 # Configuration parameters: CountComments, ExcludedMethods.

+# ExcludedMethods: refine

 Metrics/BlockLength:
 Metrics/BlockLength:

-  Max: 261
+  Max: 262

 
 # Offense count: 11
 # Configuration parameters: CountBlocks.
 
 # Offense count: 11
 # Configuration parameters: CountBlocks.


@@ -47,13 +49,13 @@ 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: 688
+# Offense count: 691

 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 179
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 179


@@ -68,7 +70,7 @@ Metrics/ModuleLength:
 Metrics/ParameterLists:
   Max: 9
 
 Metrics/ParameterLists:
   Max: 9
 

-# Offense count: 71
+# Offense count: 72

 Metrics/PerceivedComplexity:
   Max: 23
 
 Metrics/PerceivedComplexity:
   Max: 23
 


@@ -138,9 +140,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'


@@ -161,15 +163,22 @@ Style/AsciiComments:
   Exclude:
     - 'test/models/message_test.rb'
 
   Exclude:
     - 'test/models/message_test.rb'
 

-# Offense count: 229
+# Offense count: 230

 Style/Documentation:
   Enabled: false
 
 Style/Documentation:
   Enabled: false
 

+# Offense count: 462
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: when_needed, always, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
+

 # Offense count: 2
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Exclude:
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Exclude:

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

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


@@ -177,7 +186,7 @@ Style/IfUnlessModifier:
 Style/NumericLiterals:
   MinDigits: 11
 
 Style/NumericLiterals:
   MinDigits: 11
 

-# Offense count: 3064
+# Offense count: 3080

 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength: