diff options
author | Olivia Mossberg <hakurou46@gmail.com> | 2017-04-02 17:04:31 +0200 |
---|---|---|
committer | Olivia Mossberg <hakurou46@gmail.com> | 2017-04-02 17:04:31 +0200 |
commit | 30da6440d06803fe9797dc5a5741c49da93892b4 (patch) | |
tree | 170ebee825dd478476ee20aff3b0390261d4a8d5 /app/controllers/admin/reports_controller.rb | |
parent | f4b5fe9cafe7f6b5a590b45970e48b15c34c262f (diff) | |
parent | 4b7dca47130b97e2f213cb28def741c6dee46ff1 (diff) |
Merge branch 'master' of github.com:tootsuite/mastodon
It's just an upstream merge
Diffstat (limited to 'app/controllers/admin/reports_controller.rb')
-rw-r--r-- | app/controllers/admin/reports_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index 67d57e4eb..0117a18ee 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -7,7 +7,7 @@ class Admin::ReportsController < ApplicationController layout 'admin' def index - @reports = Report.includes(:account, :target_account).paginate(page: params[:page], per_page: 40) + @reports = Report.includes(:account, :target_account).order('id desc').paginate(page: params[:page], per_page: 40) @reports = params[:action_taken].present? ? @reports.resolved : @reports.unresolved end |