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

db/migrate/20240822121603_backfill_deactivates_at_in_user_blocks.rb

@@ -0,0 +1,11 @@
+class BackfillDeactivatesAtInUserBlocks < ActiveRecord::Migration[7.1]
+  class UserBlock < ApplicationRecord; end
+
+  disable_ddl_transaction!
+
+  def up
+    UserBlock.where(:needs_view => false, :deactivates_at => nil).in_batches do |relation|
+      relation.update_all("deactivates_at = GREATEST(ends_at, updated_at)")
+    end
+  end
+end

db/structure.sql

@@ -3579,6 +3579,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('23'),
 ('22'),
 ('21'),
+('20240822121603'),
 ('20240813070506'),
 ('20240618193051'),
 ('20240605134916'),