Merge remote-tracking branch 'upstream/pull/2912' into master

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 32a067c19da09d793f723e0511abd191ed08cbff..73b8cfa3f3fbecc56bc1d7da960c0cd86448ceaf 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,11 +1,10 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-08-06 20:53:30 UTC using RuboCop version 0.89.0.
+# on 2020-09-02 06:16:56 UTC using RuboCop version 0.90.0.
 # 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
 # versions of RuboCop, may require this file to be generated again.
-# versions of RuboCop, may require this file to be generated again.
 
 # Work around erblint issues.
 # https://github.com/openstreetmap/openstreetmap-website/issues/2472
@@ -34,19 +33,12 @@ Lint/AssignmentInCondition:
     - 'app/controllers/users_controller.rb'
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_tags_helper.rb'
-    - 'app/mailers/notifier.rb'
+    - 'app/mailers/user_mailer.rb'
     - 'app/models/client_application.rb'
     - 'lib/nominatim.rb'
     - 'lib/osm.rb'
     - 'script/deliver-message'
 
-# Offense count: 20
-Lint/MissingSuper:
-  Exclude:
-    - 'config/initializers/oauth.rb'
-    - 'lib/osm.rb'
-    - 'lib/session_persistence.rb'
-
 # Offense count: 682
 # Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
@@ -66,7 +58,7 @@ Metrics/BlockNesting:
 # Offense count: 25
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 645
+  Max: 643
 
 # Offense count: 68
 # Configuration parameters: IgnoredMethods.
@@ -157,14 +149,6 @@ Rails/HelperInstanceVariable:
   Exclude:
     - 'app/helpers/title_helper.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: Include.
-# Include: app/mailers/**/*.rb
-Rails/MailerName:
-  Exclude:
-    - 'app/mailers/notifier.rb'
-
 # Offense count: 5
 # Configuration parameters: Include.
 # Include: db/migrate/*.rb
@@ -183,8 +167,6 @@ Rails/OutputSafety:
     - 'app/helpers/application_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/user_blocks_helper.rb'
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
@@ -196,15 +178,6 @@ Rails/OutputSafety:
 Rails/TimeZone:
   Enabled: false
 
-# Offense count: 6
-# Cop supports --auto-correct.
-Style/ExplicitBlockArgument:
-  Exclude:
-    - 'app/controllers/api/amf_controller.rb'
-    - 'app/controllers/application_controller.rb'
-    - 'app/mailers/notifier.rb'
-    - 'test/integration/client_applications_test.rb'
-
 # Offense count: 572
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -234,7 +207,7 @@ Style/OptionalBooleanParameter:
     - 'test/models/trace_test.rb'
     - 'test/models/tracetag_test.rb'
 
-# Offense count: 44
+# Offense count: 28
 # Cop supports --auto-correct.
 Style/StringConcatenation:
   Enabled: false