Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into feature/removing_ruby_junk

2020-12-09 00:00:35 -05:00
parent bb7348fc61 c18991f174
commit 586935f07f
28 changed files with 827 additions and 7 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -100,6 +100,7 @@ Rails.application.routes.draw do
    get '/dashboard', to: 'dashboard#index'

    resources :email_domain_blocks, only: [:index, :new, :create, :destroy]
+    resources :link_blocks, only: [:index, :new, :create, :destroy]
    resources :action_logs, only: [:index]
    resources :warning_presets, except: [:new]
    resource :settings, only: [:edit, :update]