diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-11-16 22:52:37 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-11-16 22:52:37 -0600 |
| commit | b28b405b9763a0bb3df653b51e6d084b42e9a54d (patch) | |
| tree | c69f1ccb99440fea8cc94014e77687238e205160 /config | |
| parent | ee560abdbe7a2caf0f7ac6137faf248bbaff9a93 (diff) | |
| parent | dc6e031364d1f47a49ea47f20070a4e9986a4c68 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 1 | ||||
| -rw-r--r-- | config/routes.rb | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index a590b189f..cebf704ce 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -48,6 +48,7 @@ en: reserved_username: The username is reserved roles: admin: Admin + moderator: Mod unfollow: Unfollow admin: account_moderation_notes: diff --git a/config/routes.rb b/config/routes.rb index 78b96b0e4..36acd428d 100644 --- 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 |