diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-22 21:35:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-22 21:35:07 +0200 |
| commit | 8aa58e34bb2b62192a997ac7ea8919b22fc45f80 (patch) | |
| tree | abc0ea9862c55c2e114c855b20eb4a35f1141709 /app/controllers/admin/reports_controller.rb | |
| parent | 628fca50e20bcf41f206877083fc5ee8789c1088 (diff) | |
| parent | e70fc059a9511d43b42c2502514f6220b416cdd5 (diff) | |
Merge pull request #665 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |