diff options
| author | Mark Felder <feld@feld.me> | 2021-01-25 17:00:26 -0600 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-01-25 17:00:26 -0600 |
| commit | 0b19534475284b902746be1ee02ed6f1be20a4fa (patch) | |
| tree | 803256a1a3ac734c06176de6adfb1d1419754371 /lib/pleroma/web/api_spec/operations/admin | |
| parent | c29cf65ec7f681ffde70b44e745cf8bf660fc6c0 (diff) | |
| parent | f1c82fbd426651e6838a9c60578c96a25ae94df4 (diff) | |
| download | pleroma-0b19534475284b902746be1ee02ed6f1be20a4fa.tar.gz pleroma-0b19534475284b902746be1ee02ed6f1be20a4fa.zip | |
Merge branch 'develop' into docs/apache-config
Diffstat (limited to 'lib/pleroma/web/api_spec/operations/admin')
| -rw-r--r-- | lib/pleroma/web/api_spec/operations/admin/report_operation.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/api_spec/operations/admin/status_operation.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/api_spec/operations/admin/report_operation.ex b/lib/pleroma/web/api_spec/operations/admin/report_operation.ex index d60e84a66..e7acfa271 100644 --- a/lib/pleroma/web/api_spec/operations/admin/report_operation.ex +++ b/lib/pleroma/web/api_spec/operations/admin/report_operation.ex @@ -182,7 +182,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.ReportOperation do properties: Map.merge(Account.schema().properties, %{ nickname: %Schema{type: :string}, - deactivated: %Schema{type: :boolean}, + is_active: %Schema{type: :boolean}, local: %Schema{type: :boolean}, roles: %Schema{ type: :object, diff --git a/lib/pleroma/web/api_spec/operations/admin/status_operation.ex b/lib/pleroma/web/api_spec/operations/admin/status_operation.ex index fed3da27a..34a0bce07 100644 --- a/lib/pleroma/web/api_spec/operations/admin/status_operation.ex +++ b/lib/pleroma/web/api_spec/operations/admin/status_operation.ex @@ -132,7 +132,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.StatusOperation do avatar: %Schema{type: :string}, nickname: %Schema{type: :string}, display_name: %Schema{type: :string}, - deactivated: %Schema{type: :boolean}, + is_active: %Schema{type: :boolean}, local: %Schema{type: :boolean}, roles: %Schema{ type: :object, |