Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
Jenkins 2018-04-03 19:17:20 +00:00
commit 6611100480
70 changed files with 924 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/application_controller.rb
View file

@ -40,11 +40,11 @@ class ApplicationController < ActionController::Base
end
def require_admin!
redirect_to root_path unless current_user&.admin?
forbidden unless current_user&.admin?
end
def require_staff!
redirect_to root_path unless current_user&.staff?
forbidden unless current_user&.staff?
end
def check_suspension