diff options
| author | pluralcafe-docker <docker@plural.cafe> | 2018-08-23 06:16:14 +0000 |
|---|---|---|
| committer | pluralcafe-docker <docker@plural.cafe> | 2018-08-23 06:16:14 +0000 |
| commit | 0fa521de89168ef33423fc7306a33d4a1c3badf3 (patch) | |
| tree | ce3663d75ca93ea2d32e10de532eb18a230cf6e0 /app/controllers/admin/reports_controller.rb | |
| parent | a4935a8e24dcfa865fb330693d8ec90beca1aa98 (diff) | |
| parent | 8aa58e34bb2b62192a997ac7ea8919b22fc45f80 (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/controllers/admin/reports_controller.rb')
| -rw-r--r-- | app/controllers/admin/reports_controller.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index d00b3d222..5d7f43e00 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -44,14 +44,8 @@ module Admin when 'resolve' @report.resolve!(current_account) log_action :resolve, @report - when 'suspend' - Admin::SuspensionWorker.perform_async(@report.target_account.id) - - log_action :resolve, @report - log_action :suspend, @report.target_account - - resolve_all_target_account_reports when 'silence' + @report.resolve!(current_account) @report.target_account.update!(silenced: true) log_action :resolve, @report |