diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-11-26 23:41:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-26 23:41:01 +0100 |
| commit | 4aec8087c71a623abdf201bbc2619507a6b02374 (patch) | |
| tree | 931f4c972e55ec032f3f5f6b58621d0380a92a5e /app/controllers/admin/statuses_controller.rb | |
| parent | 97151840b02499a0cec1360907a6b86a1df02b3b (diff) | |
| parent | ca5d78816bb31454de28480dec5c6384ed259eef (diff) | |
Merge pull request #1640 from ClearlyClaire/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 58a0eb84c..b3fd4c424 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] - @statuses.merge!(Status.joins(:media_attachments).merge(@account.media_attachments.reorder(nil)).group(:id)).reorder('statuses.id desc') + @statuses = @statuses.merge(Status.joins(:media_attachments).merge(@account.media_attachments.reorder(nil)).group(:id)).reorder('statuses.id desc') end @statuses = @statuses.preload(:media_attachments, :mentions).page(params[:page]).per(PER_PAGE) |