Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.
This commit is contained in:
@@ -24,7 +24,8 @@ class ReportService < BaseService
|
||||
target_account: @target_account,
|
||||
status_ids: @status_ids,
|
||||
comment: @comment,
|
||||
uri: @options[:uri]
|
||||
uri: @options[:uri],
|
||||
forwarded: ActiveModel::Type::Boolean.new.cast(@options[:forward])
|
||||
)
|
||||
end
|
||||
|
||||
|
Reference in New Issue
Block a user