tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '6c3bd944f8890e1a349bd06e9585cb5ec25507e6' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire committed 2026-02-13 13:03:51 +01:00
2 parents ba098fdeb5 6c3bd944f8
commit ddc7df2064
44 files changed
+230 -48
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/controllers/api/v1/reports_controller.rb
+5 -1
View File
@@ -23,6 +23,10 @@ class Api::V1::ReportsController < Api::BaseController
end
def report_params
params.permit(:account_id, :comment, :category, :forward, forward_to_domains: [], status_ids: [], rule_ids: [])
if Mastodon::Feature.collections_enabled?
params.permit(:account_id, :comment, :category, :forward, forward_to_domains: [], status_ids: [], collection_ids: [], rule_ids: [])
else
params.permit(:account_id, :comment, :category, :forward, forward_to_domains: [], status_ids: [], rule_ids: [])
end
end
end