Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream

2023-07-12 15:44:33 +02:00
parent 71f8c45c18 ea10febd25
commit 075887e1d6
24 changed files with 275 additions and 237 deletions
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@ -68,7 +68,7 @@ namespace :admin do
    end
  end

-  resources :instances, only: [:index, :show, :destroy], constraints: { id: %r{[^/]+} } do
+  resources :instances, only: [:index, :show, :destroy], constraints: { id: %r{[^/]+} }, format: 'html' do
    member do
      post :clear_delivery_errors
      post :restart_delivery