diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 18:07:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 18:07:53 +0300 |
| commit | d7a028e20d29b8c6d0e780ac168544dfbb712d3c (patch) | |
| tree | f9fc9ea12e166aec6c4ffe476ba7a3566396b696 /spec/fixtures | |
| parent | 0d0cddc9ce20c5a7d8a2723d0aa620ca184a711a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/discussion.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/entities/discussion.json b/spec/fixtures/api/schemas/entities/discussion.json index 92863d2e084..9d7ca62435e 100644 --- a/spec/fixtures/api/schemas/entities/discussion.json +++ b/spec/fixtures/api/schemas/entities/discussion.json @@ -36,7 +36,7 @@ "updated_at": { "type": "date" }, "system": { "type": "boolean" }, "noteable_id": { "type": "integer" }, - "noteable_iid": { "type": "integer" }, + "noteable_iid": { "type": ["integer", "null"] }, "noteable_type": { "type": "string" }, "resolved": { "type": "boolean" }, "resolvable": { "type": "boolean" }, |