Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-11-24 01:17:20 +00:00
parent faad820458 e84fecb7e9
commit 167fe2ab08
34 changed files with 490 additions and 43 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -117,6 +117,7 @@ Rails.application.routes.draw do
    resources :subscriptions, only: [:index]
    resources :domain_blocks, only: [:index, :new, :create, :show, :destroy]
    resources :email_domain_blocks, only: [:index, :new, :create, :destroy]
+    resources :action_logs, only: [:index]
    resource :settings, only: [:edit, :update]

    resources :instances, only: [:index] do