Merge tag 'v3.1.5' into instance_only_statuses

2020-07-15 20:13:00 +02:00
parent e0f3a4583c 661f3f26b0
commit 06b6353483
1203 changed files with 15637 additions and 7055 deletions
--- a/app/policies/settings_policy.rb
+++ b/app/policies/settings_policy.rb
@ -8,4 +8,8 @@ class SettingsPolicy < ApplicationPolicy
  def show?
    admin?
  end
+
+  def destroy?
+    admin?
+  end
 end