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.
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user