about summary refs log tree commit diff
path: root/app/policies
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2017-12-02 14:17:11 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2017-12-02 14:17:11 +0000
commit933eafdcd3a3803e9fcf934f6f7ade667281c527 (patch)
tree94f5ab03f7cd733cc0743f3c79cf02a8de4c148f /app/policies
parentad46bc9772dfc52c7ed522658eda1a3ef608a7b3 (diff)
parent51f2eca8877d8c56a19e1b8ce4edf407c2d236fb (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/policies')
-rw-r--r--app/policies/invite_policy.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/policies/invite_policy.rb b/app/policies/invite_policy.rb
index e5c68af19..a2a65f934 100644
--- a/app/policies/invite_policy.rb
+++ b/app/policies/invite_policy.rb
@@ -10,7 +10,7 @@ class InvitePolicy < ApplicationPolicy
   end
 
   def destroy?
-    owner? || staff?
+    owner? || (Setting.min_invite_role == 'admin' ? admin? : staff?)
   end
 
   private