diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2020-12-15 14:27:06 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-15 14:27:06 +0100 |
| commit | e4f8679eaeea062e1f9ca9f58703b51ff8162c35 (patch) | |
| tree | 13940a853f1278a3c4ef89dd3a0bbedfeaaf7140 /app/services | |
| parent | 1978f7265e1e83bda25413da26f53c53110af764 (diff) | |
| parent | 8485c436d5d083c28df8c942fe521bfb46edfc9f (diff) | |
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.
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/report_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/report_service.rb b/app/services/report_service.rb index 1e955c1e7..9d9c7d6c9 100644 --- a/app/services/report_service.rb +++ b/app/services/report_service.rb @@ -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 |