Merge remote-tracking branch 'origin/master' into gs-master

2017-11-16 22:52:37 -06:00
parent ee560abdbe dc6e031364
commit b28b405b97
29 changed files with 136 additions and 72 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -168,7 +168,13 @@ Rails.application.routes.draw do
    resources :account_moderation_notes, only: [:create, :destroy]
  end

-  get '/admin', to: redirect('/admin/settings/edit', status: 302)
+  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

  namespace :api do
    # PubSubHubbub outgoing subscriptions