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

2018-08-19 09:27:18 +02:00
parent 44e31c3e53 59c68c1a74
commit 88a0395a58
22 changed files with 108 additions and 28 deletions
--- a/app/policies/invite_policy.rb
+++ b/app/policies/invite_policy.rb
@@ -9,6 +9,10 @@ class InvitePolicy < ApplicationPolicy
    min_required_role?
  end

+  def deactivate_all?
+    admin?
+  end
+
  def destroy?
    owner? || (Setting.min_invite_role == 'admin' ? admin? : staff?)
  end