Update rubocop to version 1.82.1 (#37475)

Gemfile.lock

@@ -752,7 +752,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 9)
     rspec-support (3.13.6)
-    rubocop (1.81.7)
+    rubocop (1.82.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -760,7 +760,7 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
+      rubocop-ast (>= 1.48.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.49.0)
@@ -782,7 +782,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.44.0, < 2.0)
-    rubocop-rspec (3.8.0)
+    rubocop-rspec (3.9.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.81)
     rubocop-rspec_rails (2.32.0)

app/workers/move_worker.rb

@@ -45,30 +45,34 @@ class MoveWorker
     end
 
     # Then handle accounts that follow both the old and new account
-    @source_account.passive_relationships
-                   .where(account: Account.local)
-                   .where(account: @target_account.followers.local)
-                   .in_batches do |follows|
-      ListAccount.where(follow: follows).includes(:list).find_each do |list_account|
-        list_account.list.accounts << @target_account
-      rescue ActiveRecord::RecordInvalid
-        nil
-      end
+    source_local_followers
+      .where(account: @target_account.followers.local)
+      .in_batches do |follows|
+        ListAccount.where(follow: follows).includes(:list).find_each do |list_account|
+          list_account.list.accounts << @target_account
+        rescue ActiveRecord::RecordInvalid
+          nil
+        end
     end
 
     # Finally, handle the common case of accounts not following the new account
-    @source_account.passive_relationships
-                   .where(account: Account.local)
-                   .where.not(account: @target_account.followers.local)
-                   .where.not(account_id: @target_account.id)
-                   .in_batches do |follows|
-      ListAccount.where(follow: follows).in_batches.update_all(account_id: @target_account.id)
-      num_moved += follows.update_all(target_account_id: @target_account.id)
+    source_local_followers
+      .where.not(account: @target_account.followers.local)
+      .where.not(account_id: @target_account.id)
+      .in_batches do |follows|
+        ListAccount.where(follow: follows).in_batches.update_all(account_id: @target_account.id)
+        num_moved += follows.update_all(target_account_id: @target_account.id)
     end
 
     num_moved
   end
 
+  def source_local_followers
+    @source_account
+      .passive_relationships
+      .where(account: Account.local)
+  end
+
   def queue_follow_unfollows!
     bypass_locked = @target_account.local?
 

lib/paperclip/attachment_extensions.rb

@@ -16,8 +16,7 @@ module Paperclip
       # if we're processing the original, close + unlink the source tempfile
       intermediate_files << original if name == :original
 
-      @queued_for_write[name] = style.processors
-                                     .inject(original) do |file, processor|
+      @queued_for_write[name] = style.processors.inject(original) do |file, processor|
         file = Paperclip.processor(processor).make(file, style.processor_options, self)
         intermediate_files << file unless file == original
         file