diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-03 19:07:58 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-02-03 19:23:27 +0100 |
| commit | aeacebb3d75112d0d22b9829813c388eef6ce5af (patch) | |
| tree | 98fced042da7c37db7b401eb197cc44c7aa1a41c /app/serializers/rest | |
| parent | ec26f7c1b16ca1429991212292e35e520c617485 (diff) | |
| parent | 79ca19e9b2e701d98c80afd939a98c2a3ef74830 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/workflows/build-image.yml`: Upstream updated `docker/build-push-action`, and we a different config for `docker/metadata-action` so the lines directly above were different, but it's not a real conflict. Upgraded `docker/build-push-action` as upstream did. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Upstream changed the codestyle near a line we had modified to accommodate configurable character count. Kept our change.
Diffstat (limited to 'app/serializers/rest')
| -rw-r--r-- | app/serializers/rest/admin/account_serializer.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/serializers/rest/admin/account_serializer.rb b/app/serializers/rest/admin/account_serializer.rb index ad98a53e8..959884c55 100644 --- a/app/serializers/rest/admin/account_serializer.rb +++ b/app/serializers/rest/admin/account_serializer.rb @@ -2,7 +2,7 @@ class REST::Admin::AccountSerializer < ActiveModel::Serializer attributes :id, :username, :domain, :created_at, - :email, :ip, :role, :confirmed, :suspended, + :email, :ip, :confirmed, :suspended, :silenced, :sensitized, :disabled, :approved, :locale, :invite_request @@ -11,6 +11,7 @@ class REST::Admin::AccountSerializer < ActiveModel::Serializer has_many :ips, serializer: REST::Admin::IpSerializer has_one :account, serializer: REST::AccountSerializer + has_one :role, serializer: REST::RoleSerializer def id object.id.to_s |