Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions LICENSES/CLA-signed-list.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ C/ My company has custom contribution contract with Lutra Consulting Ltd. or I a

* PeterPetrik, 31st March 2023
* tomasMizera, 31st March 2023
* harminius, 18th Aril 2023
16 changes: 15 additions & 1 deletion server/mergin/sync/public_api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,13 @@ paths:
"404":
$ref: "#/components/responses/NotFoundResp"
"422":
$ref: "#/components/responses/UnprocessableEntity"
description: Request could not be processed by server
content:
application/json:
schema:
oneOf:
- $ref: "#/components/schemas/UnprocessableEntityError"
- $ref: "#/components/schemas/TrialExpired"
x-openapi-router-controller: mergin.sync.public_api_controller
#not implemented in connexion, going directly to flask endpoint
# /project/push/chunk/{transaction_id}/{chunk_id}:
Expand Down Expand Up @@ -941,6 +947,14 @@ components:
type: string
example: survey
schemas:
UnprocessableEntityError:
description: Generic unprocessable request error
TrialExpired:
allOf:
- $ref: '#/components/schemas/CustomError'
example:
code: TrialExpired
detail: Failed to push changes. Ask the project workspace owner to log in to their Mergin Maps dashboard
CustomError:
type: object
properties:
Expand Down