diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-01-18 17:38:11 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2023-01-18 17:38:11 +0100 |
commit | 60abcb3c4c4ba899f0b4bb477c1629ecc2cd4a59 (patch) | |
tree | 02c9edee1c75254299e5385966eb8508f6ec0670 /config/routes.rb | |
parent | 472fd4307f9c963aba57e537e3ca3a8f94dfa139 (diff) | |
parent | 3588fbc76641311ab97ef530e2df4df4934805c5 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index 8639f0ef5..f78d692b6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -27,6 +27,7 @@ Rails.application.routes.draw do /blocks /domain_blocks /mutes + /followed_tags /statuses/(*any) ).freeze @@ -314,7 +315,11 @@ Rails.application.routes.draw do end resources :reports, only: [:index, :show] do - resources :actions, only: [:create], controller: 'reports/actions' + resources :actions, only: [:create], controller: 'reports/actions' do + collection do + post :preview + end + end member do post :assign_to_self |