Merge pull request #1398 from ThibG/glitch-soc/master

Merge upstream changes

1 files changed, 1 insertions, 5 deletions

diff --git a/config/routes.rb b/config/routes.rb
index ac6323e6e..56ba41ec5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -173,11 +173,7 @@ Rails.application.routes.draw do
     get '/dashboard', to: 'dashboard#index'
 
     resources :domain_allows, only: [:new, :create, :show, :destroy]
-    resources :domain_blocks, only: [:new, :create, :show, :destroy, :update] do
-      member do
-        get :edit
-      end
-    end
+    resources :domain_blocks, only: [:new, :create, :show, :destroy, :update, :edit]
 
     resources :email_domain_blocks, only: [:index, :new, :create, :destroy]
     resources :action_logs, only: [:index]