about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-04-05 18:32:06 +0200
committerThibaut Girka <thib@sitedethib.com>2020-04-05 18:32:06 +0200
commit9101254d0a70bc6f899c093f33300cffceb7c8ac (patch)
treec8e9e95a36ffb2346e3168d00364e4b614bee92a /app/controllers
parent6e426267a762f3cd1efa2c5fb120a13543567775 (diff)
parent85f0e0a606905ecda1322a0f7b65d8b4ff91dd69 (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/controllers')
-rw-r--r--app/controllers/api/v1/reports_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/api/v1/reports_controller.rb b/app/controllers/api/v1/reports_controller.rb
index 66c40f6f4..e10083d45 100644
--- a/app/controllers/api/v1/reports_controller.rb
+++ b/app/controllers/api/v1/reports_controller.rb
@@ -4,6 +4,8 @@ class Api::V1::ReportsController < Api::BaseController
   before_action -> { doorkeeper_authorize! :write, :'write:reports' }, only: [:create]
   before_action :require_user!
 
+  override_rate_limit_headers :create, family: :reports
+
   def create
     @report = ReportService.new.call(
       current_account,