Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream

2023-06-18 10:36:14 +02:00
parent fefdc3244c 39110d1d0a
commit 65cbcce997
76 changed files with 2108 additions and 1483 deletions
--- a/app/models/report.rb
+++ b/app/models/report.rb
@ -48,6 +48,7 @@ class Report < ApplicationRecord

  validate :validate_rule_ids

+  # entries here needs to be kept in sync with app/javascript/mastodon/features/notifications/components/report.jsx
  enum category: {
    other: 0,
    spam: 1_000,