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

2022-02-11 21:53:20 +01:00
parent 776e337b8d d0fcf07436
commit 51cad4f7fb
246 changed files with 10476 additions and 5605 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -228,6 +228,8 @@ Rails.application.routes.draw do
    resources :rules

    resources :reports, only: [:index, :show] do
+      resources :actions, only: [:create], controller: 'reports/actions'
+
      member do
        post :assign_to_self
        post :unassign