diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-12-13 20:05:46 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-12-13 20:05:46 +0000 |
| commit | 43b98944fb34d1a3ca37ae598327e4575d2ec315 (patch) | |
| tree | 325b180d9e182154183274b71baca9a495361202 /spec/fixtures | |
| parent | 066f1b9392f848887280fe17c5fcdfc0272de61c (diff) | |
| parent | 55f322085d0507640366b7a774fe7819771ff54b (diff) | |
| download | gitlab-ce-43b98944fb34d1a3ca37ae598327e4575d2ec315.tar.gz | |
Merge branch '13695-order-contributors-in-api' into 'master'
Adds ordering to projects contributors in API
Closes #13695
See merge request gitlab-org/gitlab-ce!15469
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/contributor.json | 18 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/contributors.json | 4 |
2 files changed, 22 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/contributor.json b/spec/fixtures/api/schemas/contributor.json new file mode 100644 index 00000000000..e88470a2363 --- /dev/null +++ b/spec/fixtures/api/schemas/contributor.json @@ -0,0 +1,18 @@ +{ + "type": "object", + "required" : [ + "name", + "email", + "commits", + "additions", + "deletions" + ], + "properties" : { + "name": { "type": "string" }, + "email": { "type": "string" }, + "commits": { "type": "integer" }, + "additions": { "type": "integer" }, + "deletions": { "type": "integer" } + }, + "additionalProperties": false +} diff --git a/spec/fixtures/api/schemas/contributors.json b/spec/fixtures/api/schemas/contributors.json new file mode 100644 index 00000000000..a9f1d1ea64f --- /dev/null +++ b/spec/fixtures/api/schemas/contributors.json @@ -0,0 +1,4 @@ +{ + "type": "array", + "items": { "$ref": "contributor.json" } +} |