diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-26 12:06:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-26 12:06:04 +0300 |
| commit | 759cd6c2985088d187ed519f2a881c2c690b34ec (patch) | |
| tree | 183e291c0404bf9b3ac7638be6fa1fe94b7d2d14 /spec/fixtures | |
| parent | 9735395f94088df7e6470e3e8a2638385ede36b6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/deployment.json | 3 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/deployment.json | 3 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/environment.json | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/spec/fixtures/api/schemas/deployment.json b/spec/fixtures/api/schemas/deployment.json index 81c2d1ef5ab..b1e3c000ddf 100644 --- a/spec/fixtures/api/schemas/deployment.json +++ b/spec/fixtures/api/schemas/deployment.json @@ -60,7 +60,8 @@ "scheduled_actions": { "type": "array", "items": { "$ref": "job/job.json" } - } + }, + "status": { "type": "string" } }, "additionalProperties": false } diff --git a/spec/fixtures/api/schemas/public_api/v4/deployment.json b/spec/fixtures/api/schemas/public_api/v4/deployment.json index 3af2dc27d55..13b10eac625 100644 --- a/spec/fixtures/api/schemas/public_api/v4/deployment.json +++ b/spec/fixtures/api/schemas/public_api/v4/deployment.json @@ -26,7 +26,8 @@ { "type": "null" }, { "$ref": "job.json" } ] - } + }, + "status": { "type": "string" } }, "additionalProperties": false } diff --git a/spec/fixtures/api/schemas/public_api/v4/environment.json b/spec/fixtures/api/schemas/public_api/v4/environment.json index 242e90fb7ac..57352017f03 100644 --- a/spec/fixtures/api/schemas/public_api/v4/environment.json +++ b/spec/fixtures/api/schemas/public_api/v4/environment.json @@ -17,7 +17,8 @@ { "type": "null" }, { "$ref": "deployment.json" } ] - } + }, + "state": { "type": "string" } }, "additionalProperties": false } |