diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-09-27 00:24:54 +0300 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-09-27 00:24:54 +0300 |
| commit | 6f9a6d37a9237d19447c7936c53df02d841f5c66 (patch) | |
| tree | d3a88f0781e757eb15d00ea8f2a72377ad726176 /spec/fixtures/api | |
| parent | 59d631371ce22e702791504a544c1be61fceb676 (diff) | |
| parent | 05d8e87dba4abaf9eb495bac147c4d4c5426da2e (diff) | |
Merge branch 'master' into ff_port_from_ee
Diffstat (limited to 'spec/fixtures/api')
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/commit/detail.json | 11 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/pipeline/basic.json | 16 |
2 files changed, 25 insertions, 2 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v4/commit/detail.json b/spec/fixtures/api/schemas/public_api/v4/commit/detail.json index b7b2535c204..88a3cad62f6 100644 --- a/spec/fixtures/api/schemas/public_api/v4/commit/detail.json +++ b/spec/fixtures/api/schemas/public_api/v4/commit/detail.json @@ -5,11 +5,18 @@ { "required" : [ "stats", - "status" + "status", + "last_pipeline" ], "properties": { "stats": { "$ref": "../commit_stats.json" }, - "status": { "type": ["string", "null"] } + "status": { "type": ["string", "null"] }, + "last_pipeline": { + "oneOf": [ + { "type": "null" }, + { "$ref": "../pipeline/basic.json" } + ] + } } } ] diff --git a/spec/fixtures/api/schemas/public_api/v4/pipeline/basic.json b/spec/fixtures/api/schemas/public_api/v4/pipeline/basic.json new file mode 100644 index 00000000000..0d127dc5297 --- /dev/null +++ b/spec/fixtures/api/schemas/public_api/v4/pipeline/basic.json @@ -0,0 +1,16 @@ +{ + "type": "object", + "required" : [ + "id", + "sha", + "ref", + "status" + ], + "properties" : { + "id": { "type": "integer" }, + "sha": { "type": "string" }, + "ref": { "type": "string" }, + "status": { "type": "string" } + }, + "additionalProperties": false +} |