diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-11-06 00:33:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-06 00:33:55 +0100 |
| commit | a25839340e93b1e93b7b99b0f65fa7da7d62bad2 (patch) | |
| tree | a329d65c115e752c3be5c262ebf96f69cd13861a /app/controllers/admin/statuses_controller.rb | |
| parent | e0f39626973fd9f5cce2d4cd3b166fb47e9c9059 (diff) | |
| parent | 4bb6b1a1e788abac7d1745e0f4eb72ad4d4ec110 (diff) | |
Merge pull request #1628 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 ef279509d..58a0eb84c 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)) + @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) |