Merge branch 'master' into glitch-soc/merge-upstream

2019-12-01 12:12:42 +01:00
parent 7f6315841c d70268f099
commit 99f1f48741
15 changed files with 116 additions and 20 deletions
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -55,7 +55,8 @@ module Admin
      params.permit(
        :account_id,
        :resolved,
-        :target_account_id
+        :target_account_id,
+        :by_target_domain
      )
    end