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

2018-04-11 00:50:09 +00:00
parent 67e77f230e d9b62e34da
commit 33c2bbdda7
40 changed files with 488 additions and 110 deletions
--- a/app/policies/user_policy.rb
+++ b/app/policies/user_policy.rb
@ -5,6 +5,10 @@ class UserPolicy < ApplicationPolicy
    staff? && !record.staff?
  end

+  def change_email?
+    staff? && !record.staff?
+  end
+
  def disable_2fa?
    admin? && !record.staff?
  end