diff options
| author | ThibG <thib@sitedethib.com> | 2020-12-09 19:06:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 19:06:13 +0100 |
| commit | b27d11dd3320cb005561f0bb1b81baecea8a7c43 (patch) | |
| tree | dba9599f5416483c4a9fcad0002e5a2d6bcd4de1 /app/controllers/admin/statuses_controller.rb | |
| parent | 25f725d67a6d2542cd586ab7c56baca572eb4f88 (diff) | |
| parent | 7d0e45a3be167d95cbc4d5f80fa989a9371802ae (diff) | |
Merge pull request #1472 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin/statuses_controller.rb')
| -rw-r--r-- | app/controllers/admin/statuses_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb index 650195034..d7c192f0d 100644 --- a/app/controllers/admin/statuses_controller.rb +++ b/app/controllers/admin/statuses_controller.rb @@ -14,7 +14,7 @@ module Admin @statuses = @account.statuses.where(visibility: [:public, :unlisted]) if params[:media] - account_media_status_ids = @account.media_attachments.attached.reorder(nil).select(:status_id).distinct + account_media_status_ids = @account.media_attachments.attached.reorder(nil).select(:status_id).group(:status_id) @statuses.merge!(Status.where(id: account_media_status_ids)) end |