diff options
| author | Mark Felder <feld@feld.me> | 2021-01-18 12:05:05 -0600 | 
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-01-18 12:05:05 -0600 | 
| commit | 44a86951a339fdb0146a237ca5178c83823629c7 (patch) | |
| tree | e38ad0c1ecf198a69762dfc95f158e649d9d4723 /lib/pleroma/web/api_spec/operations/admin | |
| parent | 63923df0a51fdae58daf71a8dd85929a29ab1546 (diff) | |
| parent | 0ad6ea205711df9d1c634f0ad2dde6d432544318 (diff) | |
| download | pleroma-44a86951a339fdb0146a237ca5178c83823629c7.tar.gz pleroma-44a86951a339fdb0146a237ca5178c83823629c7.zip | |
Merge branch 'develop' into refactor/approval_pending_user_field
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 526698fc1..d60e84a66 100644 --- a/lib/pleroma/web/api_spec/operations/admin/report_operation.ex +++ b/lib/pleroma/web/api_spec/operations/admin/report_operation.ex @@ -191,7 +191,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.ReportOperation do                moderator: %Schema{type: :boolean}              }            }, -          confirmation_pending: %Schema{type: :boolean} +          is_confirmed: %Schema{type: :boolean}          })      }    end 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 a2319bacc..fed3da27a 100644 --- a/lib/pleroma/web/api_spec/operations/admin/status_operation.ex +++ b/lib/pleroma/web/api_spec/operations/admin/status_operation.ex @@ -142,7 +142,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.StatusOperation do            }          },          tags: %Schema{type: :string}, -        confirmation_pending: %Schema{type: :string} +        is_confirmed: %Schema{type: :string}        }      }    end | 
