diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 13:54:15 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 13:54:15 +0000 |
commit | be834a25982746ffd85252ff502df42bb88cb9d5 (patch) | |
tree | b4d6a8ba0931e12fac08f05abea33a3b8ec2c8a2 /spec/fixtures/api/schemas/entities | |
parent | ee925a3597f27e92f83a50937a64068109675b3d (diff) | |
download | gitlab-ce-be834a25982746ffd85252ff502df42bb88cb9d5.tar.gz |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc32
Diffstat (limited to 'spec/fixtures/api/schemas/entities')
4 files changed, 44 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/entities/group_group_link.json b/spec/fixtures/api/schemas/entities/group_group_link.json index 4c9aae140d2..dda94dc3362 100644 --- a/spec/fixtures/api/schemas/entities/group_group_link.json +++ b/spec/fixtures/api/schemas/entities/group_group_link.json @@ -1,10 +1,12 @@ { "type": "object", - "required": ["id", "created_at", "expires_at", "access_level"], + "required": ["id", "created_at", "expires_at", "can_update", "can_remove", "access_level"], "properties": { "id": { "type": "integer" }, "created_at": { "type": "date-time" }, "expires_at": { "type": ["date-time", "null"] }, + "can_update": { "type": "boolean" }, + "can_remove": { "type": "boolean" }, "access_level": { "type": "object", "required": ["integer_value", "string_value"], diff --git a/spec/fixtures/api/schemas/entities/merge_request_basic.json b/spec/fixtures/api/schemas/entities/merge_request_basic.json index 3c19528d71b..b061176f6a7 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_basic.json +++ b/spec/fixtures/api/schemas/entities/merge_request_basic.json @@ -1,6 +1,7 @@ { "type": "object", "properties" : { + "title": { "type": "string" }, "state": { "type": "string" }, "merge_status": { "type": "string" }, "source_branch_exists": { "type": "boolean" }, diff --git a/spec/fixtures/api/schemas/entities/test_case.json b/spec/fixtures/api/schemas/entities/test_case.json index 0dd3c5d472f..d731d7eed0a 100644 --- a/spec/fixtures/api/schemas/entities/test_case.json +++ b/spec/fixtures/api/schemas/entities/test_case.json @@ -8,6 +8,7 @@ "status": { "type": "string" }, "name": { "type": "string" }, "classname": { "type": "string" }, + "file": { "type": ["string", "null"] }, "execution_time": { "type": "float" }, "system_output": { "type": ["string", "null"] }, "stack_trace": { "type": ["string", "null"] }, diff --git a/spec/fixtures/api/schemas/entities/trigger.json b/spec/fixtures/api/schemas/entities/trigger.json new file mode 100644 index 00000000000..5c46142673f --- /dev/null +++ b/spec/fixtures/api/schemas/entities/trigger.json @@ -0,0 +1,39 @@ +{ + "type": "object", + "required": [ + "description", + "owner", + "last_used", + "has_token_exposed", + "token", + "can_access_project" + ], + "properties": { + "description": { + "type": ["string", "null"] + }, + "owner": { + "type": "object", + "$ref": "user.json" + }, + "last_used": { + "type": ["datetime", "null"] + }, + "token": { + "type": "string" + }, + "has_token_exposed": { + "type": "boolean" + }, + "can_access_project": { + "type": "boolean" + }, + "edit_project_trigger_path": { + "type": "string" + }, + "project_trigger_path": { + "type": "string" + } + }, + "additionalProperties": false +} |