diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-10-14 12:33:24 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-10-14 12:33:24 -0500 |
| commit | 83770b7b391fdf8bdc22f63047b1cf444a7b16ce (patch) | |
| tree | bba3b4d867ee5cdc07165784868c28f174c10317 /lib/pleroma/web/api_spec | |
| parent | 7d8f610720abdadeff9238aa8a345a91e473e0fa (diff) | |
| parent | 20137056900f97af34f4433858cbdf69be6c9840 (diff) | |
| download | pleroma-83770b7b391fdf8bdc22f63047b1cf444a7b16ce.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into aliases
Diffstat (limited to 'lib/pleroma/web/api_spec')
| -rw-r--r-- | lib/pleroma/web/api_spec/schemas/chat.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/api_spec/schemas/status.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/api_spec/schemas/chat.ex b/lib/pleroma/web/api_spec/schemas/chat.ex index b4986b734..65f908e33 100644 --- a/lib/pleroma/web/api_spec/schemas/chat.ex +++ b/lib/pleroma/web/api_spec/schemas/chat.ex @@ -50,7 +50,7 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Chat do "fields" => [] }, "statuses_count" => 1, - "locked" => false, + "is_locked" => false, "created_at" => "2020-04-16T13:40:15.000Z", "display_name" => "lain", "fields" => [], diff --git a/lib/pleroma/web/api_spec/schemas/status.ex b/lib/pleroma/web/api_spec/schemas/status.ex index 947e42890..e6890df2d 100644 --- a/lib/pleroma/web/api_spec/schemas/status.ex +++ b/lib/pleroma/web/api_spec/schemas/status.ex @@ -252,7 +252,7 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Status do "header" => "http://localhost:4001/images/banner.png", "header_static" => "http://localhost:4001/images/banner.png", "id" => "9toJCsKN7SmSf3aj5c", - "locked" => false, + "is_locked" => false, "note" => "Tester Number 6", "pleroma" => %{ "background_image" => nil, |