diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-04-05 18:32:06 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-04-05 18:32:06 +0200 |
commit | 9101254d0a70bc6f899c093f33300cffceb7c8ac (patch) | |
tree | c8e9e95a36ffb2346e3168d00364e4b614bee92a /app/models/report.rb | |
parent | 6e426267a762f3cd1efa2c5fb120a13543567775 (diff) | |
parent | 85f0e0a606905ecda1322a0f7b65d8b4ff91dd69 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/public.js`: Upstream modified code that we split between multiple files due to glitch-soc's theming system. Ported those changes.
Diffstat (limited to 'app/models/report.rb')
-rw-r--r-- | app/models/report.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/report.rb b/app/models/report.rb index 356c23d68..f31bcfd2e 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -18,6 +18,9 @@ class Report < ApplicationRecord include Paginable + include RateLimitable + + rate_limit by: :account, family: :reports belongs_to :account belongs_to :target_account, class_name: 'Account' |