Merge branch 'master' into glitch-soc/merge-upstream

2020-11-07 18:19:34 +01:00
parent 5a9fc749c3 ee8cf246cf
commit 412218af2e
56 changed files with 403 additions and 170 deletions
--- a/app/policies/account_policy.rb
+++ b/app/policies/account_policy.rb
@ -25,6 +25,14 @@ class AccountPolicy < ApplicationPolicy
    staff?
  end

+  def sensitive?
+    staff? && !record.user&.staff?
+  end
+
+  def unsensitive?
+    staff?
+  end
+
  def silence?
    staff? && !record.user&.staff?
  end