Merge pull request #34666 from vinistock/upgrade_rubocop_and_fix_offenses

Upgrade Rubocop to 0.61.1 and fix offenses

Merge pull request #34666 from vinistock/upgrade_rubocop_and_fix_offenses
Upgrade Rubocop to 0.61.1 and fix offenses
b3108275 · Rafael França · GitHub · 10457475 · 3b7a4d3d · b3108275
6 changed file
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -399,7 +399,7 @@ GEM
      resque (~> 1.26)
      rufus-scheduler (~> 3.2)
    retriable (3.1.2)
-    rubocop (0.60.0)
+    rubocop (0.61.1)
      jaro_winkler (~> 1.5.1)
      parallel (~> 1.10)
      parser (>= 2.5, != 2.5.1.1)

--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
--- a/activerecord/lib/active_record/type.rb
+++ b/activerecord/lib/active_record/type.rb
--- a/activerecord/test/support/config.rb
+++ b/activerecord/test/support/config.rb
--- a/activesupport/lib/active_support/descendants_tracker.rb
+++ b/activesupport/lib/active_support/descendants_tracker.rb
@@ -38,6 +38,7 @@ def store_inherited(klass, descendant)
      end

      private
+
        def accumulate_descendants(klass, acc)
          if direct_descendants = @@direct_descendants[klass]
            acc.concat(direct_descendants)