diff options
| author | Travis Miller <travis@travismiller.com> | 2017-08-19 12:56:17 -0500 |
|---|---|---|
| committer | Travis Miller <travis@travismiller.com> | 2017-08-29 08:31:36 -0500 |
| commit | 6782b406f77d237e58c23a3bce444e3cd4dde849 (patch) | |
| tree | 2f2c1e4318c3b0600395a8d95483c9ac7a5c7f27 | |
| parent | 8cbc9c4ed032e7a4f73aeb86a0bec152a1c7b696 (diff) | |
| download | gitlab-ce-6782b406f77d237e58c23a3bce444e3cd4dde849.tar.gz | |
Add time stats to API schema for issue and merge request end points
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/issues.json | 8 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/merge_requests.json | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v4/issues.json b/spec/fixtures/api/schemas/public_api/v4/issues.json index bd6bfc03199..8acd9488215 100644 --- a/spec/fixtures/api/schemas/public_api/v4/issues.json +++ b/spec/fixtures/api/schemas/public_api/v4/issues.json @@ -78,7 +78,13 @@ "downvotes": { "type": "integer" }, "due_date": { "type": ["date", "null"] }, "confidential": { "type": "boolean" }, - "web_url": { "type": "uri" } + "web_url": { "type": "uri" }, + "time_stats": { + "time_estimate": { "type": "integer" }, + "total_time_spent": { "type": "integer" }, + "human_time_estimate": { "type": ["string", "null"] }, + "human_total_time_spent": { "type": ["string", "null"] } + } }, "required": [ "id", "iid", "project_id", "title", "description", diff --git a/spec/fixtures/api/schemas/public_api/v4/merge_requests.json b/spec/fixtures/api/schemas/public_api/v4/merge_requests.json index 60aa47c1259..31b3f4ba946 100644 --- a/spec/fixtures/api/schemas/public_api/v4/merge_requests.json +++ b/spec/fixtures/api/schemas/public_api/v4/merge_requests.json @@ -72,7 +72,13 @@ "user_notes_count": { "type": "integer" }, "should_remove_source_branch": { "type": ["boolean", "null"] }, "force_remove_source_branch": { "type": ["boolean", "null"] }, - "web_url": { "type": "uri" } + "web_url": { "type": "uri" }, + "time_stats": { + "time_estimate": { "type": "integer" }, + "total_time_spent": { "type": "integer" }, + "human_time_estimate": { "type": ["string", "null"] }, + "human_total_time_spent": { "type": ["string", "null"] } + } }, "required": [ "id", "iid", "project_id", "title", "description", |