diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-08-21 18:24:48 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-21 18:24:48 +0200 |
commit | 8b4abaa90d8dff64525d92c3ba1c750356608240 (patch) | |
tree | 51f194442d2ec7ab760b443b98c7685f64481ca7 /app/models/form | |
parent | c78918162642649ce294d89effbf2e815c2aa327 (diff) | |
parent | f06fa099625e928e5858ea81a20be1eddf6c6fbb (diff) |
Merge branch 'master' into glitch-soc/master
Conflicts: config/routes.rb Added the “endorsements” route from upstream.
Diffstat (limited to 'app/models/form')
-rw-r--r-- | app/models/form/status_batch.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/form/status_batch.rb b/app/models/form/status_batch.rb index 4f08a3049..8f5fd1fa2 100644 --- a/app/models/form/status_batch.rb +++ b/app/models/form/status_batch.rb @@ -23,7 +23,7 @@ class Form::StatusBatch media_attached_status_ids = MediaAttachment.where(status_id: status_ids).pluck(:status_id) ApplicationRecord.transaction do - Status.where(id: media_attached_status_ids).find_each do |status| + Status.where(id: media_attached_status_ids).reorder(nil).find_each do |status| status.update!(sensitive: sensitive) log_action :update, status end @@ -35,7 +35,7 @@ class Form::StatusBatch end def delete_statuses - Status.where(id: status_ids).find_each do |status| + Status.where(id: status_ids).reorder(nil).find_each do |status| RemovalWorker.perform_async(status.id) log_action :destroy, status end |