diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-07 15:40:28 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-07 15:40:28 +0000 |
| commit | 8b33e654c09aaa20545e7c246585fa2d3217cecb (patch) | |
| tree | 9cd6fc560ea034f41ae7607e77a10561e67a9213 /spec/fixtures/api/schemas/public_api/v3/issues.json | |
| parent | 9fc63aa7f65ef74eb40ebc884de8fc8e031969db (diff) | |
| parent | 1dab640357fa1ba8992757499e4167fcd4ce6276 (diff) | |
| download | gitlab-ce-8b33e654c09aaa20545e7c246585fa2d3217cecb.tar.gz | |
Merge branch 'master' into '33929-allow-to-enable-perf-bar-for-a-group'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'spec/fixtures/api/schemas/public_api/v3/issues.json')
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v3/issues.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v3/issues.json b/spec/fixtures/api/schemas/public_api/v3/issues.json index f2ee9c925ae..51b0822bc66 100644 --- a/spec/fixtures/api/schemas/public_api/v3/issues.json +++ b/spec/fixtures/api/schemas/public_api/v3/issues.json @@ -22,7 +22,8 @@ "properties": { "id": { "type": "integer" }, "iid": { "type": "integer" }, - "project_id": { "type": "integer" }, + "project_id": { "type": ["integer", "null"] }, + "group_id": { "type": ["integer", "null"] }, "title": { "type": "string" }, "description": { "type": ["string", "null"] }, "state": { "type": "string" }, |