Merge pull request #585 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

1 files changed, 3 insertions, 7 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 95a25536b..3373818b0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -127,6 +127,8 @@ Rails.application.routes.draw do
   resource :share, only: [:show, :create]
 
   namespace :admin do
+    get '/dashboard', to: 'dashboard#index'
+
     resources :subscriptions, only: [:index]
     resources :domain_blocks, only: [:index, :new, :create, :show, :destroy]
     resources :email_domain_blocks, only: [:index, :new, :create, :destroy]
@@ -199,13 +201,7 @@ Rails.application.routes.draw do
     resources :account_moderation_notes, only: [:create, :destroy]
   end
 
-  authenticate :user, lambda { |u| u.admin? } do
-    get '/admin', to: redirect('/admin/settings/edit', status: 302)
-  end
-
-  authenticate :user, lambda { |u| u.moderator? } do
-    get '/admin', to: redirect('/admin/reports', status: 302)
-  end
+  get '/admin', to: redirect('/admin/dashboard', status: 302)
 
   namespace :api do
     # PubSubHubbub outgoing subscriptions