diff options
| author | feld <feld@feld.me> | 2021-01-25 16:54:57 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-01-25 16:54:57 +0000 |
| commit | f1c82fbd426651e6838a9c60578c96a25ae94df4 (patch) | |
| tree | 9b6933bcfaea56aadf855c59f7783b73f6e5fff8 /lib/pleroma/web/api_spec/operations | |
| parent | 0a6f5f479348eff5f5404d4455fcb8254809812f (diff) | |
| parent | f868dcf3acc0fd687a4a74e74f6e150ef565f787 (diff) | |
| download | pleroma-f1c82fbd426651e6838a9c60578c96a25ae94df4.tar.gz | |
Merge branch 'refactor/deactivated_user_field' into 'develop'
Change user.deactivated field to user.is_active
See merge request pleroma/pleroma!3073
Diffstat (limited to 'lib/pleroma/web/api_spec/operations')
| -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, |