Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 08:48:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2024-07-16 17:54:36 +02:00
parent b7b6f1c89a 66430cb25c
commit c546757cd1
53 changed files with 177 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/reports_controller.rb
View File

@@ -10,7 +10,7 @@ class Api::V1::ReportsController < Api::BaseController
@report = ReportService.new.call(
current_account,
reported_account,
report_params
report_params.merge(application: doorkeeper_token.application)
)
render json: @report, serializer: REST::ReportSerializer