Merge remote-tracking branch 'parent/main' into kb_migration

2023-09-06 10:09:07 +09:00 · 2023-09-06 10:09:07 +09:00 · fdf1d6df38
commit fdf1d6df38
parent 3ec70d2e99 9d290c23d2
41 changed files with 752 additions and 569 deletions
--- a/app/models/admin/status_batch_action.rb
+++ b/app/models/admin/status_batch_action.rb
@ -23,7 +23,7 @@ class Admin::StatusBatchAction
  private

  def statuses
-    Status.with_discarded.where(id: status_ids)
+    Status.with_discarded.where(id: status_ids).reorder(nil)
  end

  def process_action!