diff options
author | Rémy Coutable <remy@rymai.me> | 2018-06-13 10:41:00 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-06-13 10:41:00 +0300 |
commit | 886b81e5c71529f1d61c4de4c16aab6171e1600e (patch) | |
tree | ac93a814cbdb73c722eae6d671be36a3ebb98ad5 /spec/fixtures | |
parent | a84cdff0dbb6a20a26c7e25a81f4bdf0a33b9bfc (diff) | |
parent | 404ef05002e067d057dabafb4945d79a49d028bc (diff) |
Merge branch 'commits_api_with_stats' into 'master'
Added with_stats option to GET /projects/:id/repository/commits (API)
See merge request gitlab-org/gitlab-ce!19484
Diffstat (limited to 'spec/fixtures')
-rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/commit/with_stats.json | 14 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/commits_with_stats.json | 4 |
2 files changed, 18 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v4/commit/with_stats.json b/spec/fixtures/api/schemas/public_api/v4/commit/with_stats.json new file mode 100644 index 00000000000..3b5dd547e69 --- /dev/null +++ b/spec/fixtures/api/schemas/public_api/v4/commit/with_stats.json @@ -0,0 +1,14 @@ +{ + "type": "object", + "allOf": [ + { "$ref": "basic.json" }, + { + "required" : [ + "stats" + ], + "properties": { + "stats": { "$ref": "../commit_stats.json" } + } + } + ] +} diff --git a/spec/fixtures/api/schemas/public_api/v4/commits_with_stats.json b/spec/fixtures/api/schemas/public_api/v4/commits_with_stats.json new file mode 100644 index 00000000000..23511123ce4 --- /dev/null +++ b/spec/fixtures/api/schemas/public_api/v4/commits_with_stats.json @@ -0,0 +1,4 @@ +{ + "type": "array", + "items": { "$ref": "commit/with_stats.json" } +} |