diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-01-19 14:22:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-19 14:22:59 +0100 |
commit | b209e919bddb4bb72bb4f8589f4b15654f22ef53 (patch) | |
tree | ccd980d2d701c03f9c16358908f20560f2d5be2c /config/routes.rb | |
parent | f6acc039ec95c6d1c8cc2e2955f2af31d27e928c (diff) | |
parent | c42938aed4677f52207bbb6389c7edc2772a6f7a (diff) |
Merge pull request #1662 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/config/routes.rb b/config/routes.rb index 285a1cdc9..f071b9379 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -233,8 +233,6 @@ Rails.application.routes.draw do post :reopen post :resolve end - - resources :reported_statuses, only: [:create] end resources :report_notes, only: [:create, :destroy] @@ -261,7 +259,13 @@ Rails.application.routes.draw do resource :change_email, only: [:show, :update] resource :reset, only: [:create] resource :action, only: [:new, :create], controller: 'account_actions' - resources :statuses, only: [:index, :show, :create, :update, :destroy] + + resources :statuses, only: [:index] do + collection do + post :batch + end + end + resources :relationships, only: [:index] resource :confirmation, only: [:create] do @@ -518,7 +522,7 @@ Rails.application.routes.draw do resource :action, only: [:create], controller: 'account_actions' end - resources :reports, only: [:index, :show] do + resources :reports, only: [:index, :update, :show] do member do post :assign_to_self post :unassign |