diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-04 23:18:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-04 23:18:14 +0100 |
| commit | 76b4e7727b7497c1b68e06133831701f8950ae19 (patch) | |
| tree | dee110c9c6afd598b202e73283d5c8f8ae6d3999 /app/serializers | |
| parent | ec26f7c1b16ca1429991212292e35e520c617485 (diff) | |
| parent | fa433ac5a638b00f5bf77ee52955696d7aa842d6 (diff) | |
Merge pull request #2101 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers')
| -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 |