diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-02-13 16:46:37 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-02-13 16:46:37 +0000 |
| commit | 480b957e943696b95cae0a7d8b779fe9b2051d8e (patch) | |
| tree | ff83b9e898c1696c9e18d1eae38d742847fc9fe3 /spec | |
| parent | b3679f767c16b0529fbec9f8c257f29fd53e6f74 (diff) | |
| parent | 2bdb578032073f09f41e16c7114f96899aa17927 (diff) | |
| download | gitlab-ce-480b957e943696b95cae0a7d8b779fe9b2051d8e.tar.gz | |
Merge branch 'ce-rc/move-all-ee-specs-to-ee-specs' into 'master'
Port spec/fixtures/api/schemas/deployment.json from EE
See merge request gitlab-org/gitlab-ce!17090
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/fixtures/api/schemas/deployment.json | 45 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/deployments.json | 44 |
2 files changed, 46 insertions, 43 deletions
diff --git a/spec/fixtures/api/schemas/deployment.json b/spec/fixtures/api/schemas/deployment.json new file mode 100644 index 00000000000..536e6475c23 --- /dev/null +++ b/spec/fixtures/api/schemas/deployment.json @@ -0,0 +1,45 @@ +{ + "additionalProperties": false, + "properties": { + "created_at": { + "type": "string" + }, + "id": { + "type": "integer" + }, + "iid": { + "type": "integer" + }, + "last?": { + "type": "boolean" + }, + "ref": { + "additionalProperties": false, + "properties": { + "name": { + "type": "string" + } + }, + "required": [ + "name" + ], + "type": "object" + }, + "sha": { + "type": "string" + }, + "tag": { + "type": "boolean" + } + }, + "required": [ + "sha", + "created_at", + "iid", + "tag", + "last?", + "ref", + "id" + ], + "type": "object" +} diff --git a/spec/fixtures/api/schemas/deployments.json b/spec/fixtures/api/schemas/deployments.json index 1112f23aab2..7bf50e4f859 100644 --- a/spec/fixtures/api/schemas/deployments.json +++ b/spec/fixtures/api/schemas/deployments.json @@ -3,49 +3,7 @@ "properties": { "deployments": { "items": { - "additionalProperties": false, - "properties": { - "created_at": { - "type": "string" - }, - "id": { - "type": "integer" - }, - "iid": { - "type": "integer" - }, - "last?": { - "type": "boolean" - }, - "ref": { - "additionalProperties": false, - "properties": { - "name": { - "type": "string" - } - }, - "required": [ - "name" - ], - "type": "object" - }, - "sha": { - "type": "string" - }, - "tag": { - "type": "boolean" - } - }, - "required": [ - "sha", - "created_at", - "iid", - "tag", - "last?", - "ref", - "id" - ], - "type": "object" + "$ref": "deployment.json" }, "minItems": 1, "type": "array" |