diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-08-11 19:19:27 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-08-11 19:19:27 +0200 |
| commit | 78fa15d08ff0b840b8b95f87e99a80a109110530 (patch) | |
| tree | ab65860a80c213128c11734b396bf78954dd9003 /config | |
| parent | 03712799e2cd51613c8e73cbd6379c8058fae466 (diff) | |
| parent | ef057584fd2714d94666f9ffef4aa89147eda72c (diff) | |
Merge branch 'master' into glitch-soc/master
Conflicts: - `streaming/index.js`: Upstream entirely refactored it. Ported our changes to upstream's refactor. Hopefuly.
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 6 |
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] |