diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-06-29 18:27:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-29 18:27:34 +0200 |
| commit | 54ed35f57c55fff639c8192b99fc60ab69c54f06 (patch) | |
| tree | 78cee27bfe871569f3ae2e7aa62d847fe9df7046 /app/serializers/rest/admin | |
| parent | 63f79874b59b3ba28c0f940b9d36ea7aacb44c93 (diff) | |
| parent | 485b43ed7e312ab2c3bad446132c57d6a0ce7de4 (diff) | |
Merge pull request #1801 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/rest/admin')
| -rw-r--r-- | app/serializers/rest/admin/domain_allow_serializer.rb | 9 | ||||
| -rw-r--r-- | app/serializers/rest/admin/report_serializer.rb | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/app/serializers/rest/admin/domain_allow_serializer.rb b/app/serializers/rest/admin/domain_allow_serializer.rb new file mode 100644 index 000000000..ebdf33815 --- /dev/null +++ b/app/serializers/rest/admin/domain_allow_serializer.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class REST::Admin::DomainAllowSerializer < ActiveModel::Serializer + attributes :id, :domain, :created_at + + def id + object.id.to_s + end +end diff --git a/app/serializers/rest/admin/report_serializer.rb b/app/serializers/rest/admin/report_serializer.rb index 237f41d8e..44b4726e4 100644 --- a/app/serializers/rest/admin/report_serializer.rb +++ b/app/serializers/rest/admin/report_serializer.rb @@ -2,7 +2,7 @@ class REST::Admin::ReportSerializer < ActiveModel::Serializer attributes :id, :action_taken, :action_taken_at, :category, :comment, - :created_at, :updated_at + :forwarded, :created_at, :updated_at has_one :account, serializer: REST::Admin::AccountSerializer has_one :target_account, serializer: REST::Admin::AccountSerializer |