diff options
| author | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-01 14:03:57 +0200 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-14 14:50:32 +0200 |
| commit | 994e7d135947ca162c147c5e0992a0190de22808 (patch) | |
| tree | cd9ea4d93269c8597541f8c59e89a83ca2b56d2b /spec/fixtures | |
| parent | 2b82f907abf2074ac332531d6142893d081f44b9 (diff) | |
| download | gitlab-ce-994e7d135947ca162c147c5e0992a0190de22808.tar.gz | |
Create system notes for MR too, improve doc + clean up code
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/issues.json | 2 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/merge_requests.json | 2 |
2 files changed, 2 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 8c854a43fc6..b7d6dbff031 100644 --- a/spec/fixtures/api/schemas/public_api/v4/issues.json +++ b/spec/fixtures/api/schemas/public_api/v4/issues.json @@ -9,7 +9,7 @@ "title": { "type": "string" }, "description": { "type": ["string", "null"] }, "state": { "type": "string" }, - "discussion_locked": { "type": "boolean" }, + "discussion_locked": { "type": ["boolean", "null"] }, "created_at": { "type": "date" }, "updated_at": { "type": "date" }, "labels": { 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 3b42333bb10..5828be5255b 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,7 @@ "user_notes_count": { "type": "integer" }, "should_remove_source_branch": { "type": ["boolean", "null"] }, "force_remove_source_branch": { "type": ["boolean", "null"] }, - "discussion_locked": { "type": "boolean" }, + "discussion_locked": { "type": ["boolean", "null"] }, "web_url": { "type": "uri" }, "time_stats": { "time_estimate": { "type": "integer" }, |