diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
commit | 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde (patch) | |
tree | dc4d20fe6064752c0bd323187252c77e0a89144b /spec/fixtures/api | |
parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'spec/fixtures/api')
8 files changed, 139 insertions, 5 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request_noteable.json b/spec/fixtures/api/schemas/entities/merge_request_noteable.json index 4ef19ed32c2..4b790a2c34b 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_noteable.json +++ b/spec/fixtures/api/schemas/entities/merge_request_noteable.json @@ -12,6 +12,8 @@ "state": { "type": "string" }, "source_branch": { "type": "string" }, "target_branch": { "type": "string" }, + "source_branch_path": { "type": "string" }, + "target_branch_path": { "type": "string" }, "diff_head_sha": { "type": "string" }, "create_note_path": { "type": ["string", "null"] }, "preview_note_path": { "type": ["string", "null"] }, @@ -22,11 +24,13 @@ "type": "object", "required": [ "can_create_note", - "can_update" + "can_update", + "can_approve" ], "properties": { "can_create_note": { "type": "boolean" }, - "can_update": { "type": "boolean" } + "can_update": { "type": "boolean" }, + "can_approve": { "type": "boolean" } }, "additionalProperties": false }, diff --git a/spec/fixtures/api/schemas/external_validation.json b/spec/fixtures/api/schemas/external_validation.json index 4a2538a020e..411c2ed591b 100644 --- a/spec/fixtures/api/schemas/external_validation.json +++ b/spec/fixtures/api/schemas/external_validation.json @@ -3,6 +3,7 @@ "required" : [ "project", "user", + "credit_card", "pipeline", "builds", "total_builds_count" @@ -43,6 +44,17 @@ "sign_in_count": { "type": "integer" } } }, + "credit_card": { + "type": "object", + "required": [ + "similar_cards_count", + "similar_holder_names_count" + ], + "properties": { + "similar_cards_count": { "type": "integer" }, + "similar_holder_names_count": { "type": "integer" } + } + }, "pipeline": { "type": "object", "required": [ diff --git a/spec/fixtures/api/schemas/graphql/packages/package_details.json b/spec/fixtures/api/schemas/graphql/packages/package_details.json index 50e52a7bb87..33eb67a0280 100644 --- a/spec/fixtures/api/schemas/graphql/packages/package_details.json +++ b/spec/fixtures/api/schemas/graphql/packages/package_details.json @@ -13,7 +13,8 @@ "pipelines", "versions", "status", - "canDestroy" + "canDestroy", + "lastDownloadedAt" ], "properties": { "id": { @@ -173,6 +174,9 @@ }, "composerConfigRepositoryUrl": { "type": "string" + }, + "lastDownloadedAt": { + "type": ["string", "null"] } } } diff --git a/spec/fixtures/api/schemas/ml/get_experiment.json b/spec/fixtures/api/schemas/ml/get_experiment.json new file mode 100644 index 00000000000..cf8da7f999f --- /dev/null +++ b/spec/fixtures/api/schemas/ml/get_experiment.json @@ -0,0 +1,23 @@ +{ + "type": "object", + "required": [ + "experiment" + ], + "properties": { + "experiment": { + "type": "object", + "required" : [ + "experiment_id", + "name", + "artifact_location", + "lifecycle_stage" + ], + "properties" : { + "experiment_id": { "type": "string" }, + "name": { "type": "string" }, + "artifact_location": { "type": "string" }, + "lifecycle_stage": { "type": { "enum" : ["active", "deleted"] } } + } + } + } +} diff --git a/spec/fixtures/api/schemas/ml/run.json b/spec/fixtures/api/schemas/ml/run.json new file mode 100644 index 00000000000..2418f44b21f --- /dev/null +++ b/spec/fixtures/api/schemas/ml/run.json @@ -0,0 +1,47 @@ +{ + "type": "object", + "required": [ + "run" + ], + "properties": { + "run": { + "type": "object", + "required": [ + "info", + "data" + ], + "properties": { + "info": { + "type": "object", + "required": [ + "run_id", + "run_uuid", + "user_id", + "experiment_id", + "status", + "start_time", + "artifact_uri", + "lifecycle_stage" + ], + "optional": [ + "end_time" + ], + "properties": { + "run_id": { "type": "string" }, + "run_uuid": { "type": "string" }, + "experiment_id": { "type": "string" }, + "artifact_location": { "type": "string" }, + "start_time": { "type": "integer" }, + "end_time": { "type": "integer" }, + "user_id": "", + "status": { "type": { "enum" : ["RUNNING", "SCHEDULED", "FINISHED", "FAILED", "KILLED"] } }, + "lifecycle_stage": { "type": { "enum" : ["active"] } } + } + }, + "data": { + "type": "object" + } + } + } + } +} diff --git a/spec/fixtures/api/schemas/ml/update_run.json b/spec/fixtures/api/schemas/ml/update_run.json new file mode 100644 index 00000000000..b429444120f --- /dev/null +++ b/spec/fixtures/api/schemas/ml/update_run.json @@ -0,0 +1,35 @@ +{ + "type": "object", + "required": [ + "run_info" + ], + "properties": { + "run_info": { + "type": "object", + "required": [ + "run_id", + "run_uuid", + "user_id", + "experiment_id", + "status", + "start_time", + "artifact_uri", + "lifecycle_stage" + ], + "optional": [ + "end_time" + ], + "properties": { + "run_id": { "type": "string" }, + "run_uuid": { "type": "string" }, + "experiment_id": { "type": "string" }, + "artifact_location": { "type": "string" }, + "start_time": { "type": "integer" }, + "end_time": { "type": "integer" }, + "user_id": { "type": "string" }, + "status": { "type": { "enum" : ["RUNNING", "SCHEDULED", "FINISHED", "FAILED", "KILLED"] } }, + "lifecycle_stage": { "type": { "enum" : ["active"] } } + } + } + } +} diff --git a/spec/fixtures/api/schemas/public_api/v4/job.json b/spec/fixtures/api/schemas/public_api/v4/job.json index afed4f23017..f6b12d3a1c0 100644 --- a/spec/fixtures/api/schemas/public_api/v4/job.json +++ b/spec/fixtures/api/schemas/public_api/v4/job.json @@ -20,7 +20,8 @@ "artifacts", "artifacts_expire_at", "tag_list", - "runner" + "runner", + "project" ], "properties": { "id": { "type": "integer" }, @@ -64,6 +65,9 @@ { "type": "null" }, { "$ref": "runner.json" } ] + }, + "project": { + "ci_job_token_scope_enabled": { "type": "boolean" } } }, "additionalProperties":false diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/package.json b/spec/fixtures/api/schemas/public_api/v4/packages/package.json index 607e0df1886..5d0d5f63aa9 100644 --- a/spec/fixtures/api/schemas/public_api/v4/packages/package.json +++ b/spec/fixtures/api/schemas/public_api/v4/packages/package.json @@ -6,7 +6,9 @@ "package_type", "status", "_links", - "versions" + "versions", + "created_at", + "last_downloaded_at" ], "properties": { "name": { @@ -38,6 +40,9 @@ "created_at": { "type": "string" }, + "last_downloaded_at": { + "type": ["string", "null"] + }, "versions": { "type": "array", "items": { |