Merge branch 'dashboard' into rebase_consul_master

2018-09-27 09:18:27 +02:00
parent 2a0664d473 177eedf8e4
commit 488e7e081f
72 changed files with 1825 additions and 536 deletions
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -159,6 +159,12 @@ namespace :admin do
    get :users, on: :collection
  end

+  resources :admin_notifications do
+    member do
+      post :deliver
+    end
+  end
+
  resources :emails_download, only: :index do
    get :generate_csv, on: :collection
  end