Merge branch 'master' into glitch-soc/merge-upstream

2019-08-08 08:44:33 +02:00
parent 86cfa2ea6c f51c7c105f
commit ebc0521ba8
27 changed files with 266 additions and 59 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -157,7 +157,11 @@ 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]
+    resources :domain_blocks, only: [:new, :create, :show, :destroy, :update] do
+      member do
+        get :edit
+      end
+    end
    resources :email_domain_blocks, only: [:index, :new, :create, :destroy]
    resources :action_logs, only: [:index]
    resources :warning_presets, except: [:new]