diff options
| author | Heinrich Lee Yu <heinrich@gitlab.com> | 2018-11-30 12:03:35 +0800 |
|---|---|---|
| committer | Heinrich Lee Yu <hleeyu@gmail.com> | 2018-12-20 07:28:28 +0800 |
| commit | 95aae95a1cbb55facd127c74d6c044b13533f3fe (patch) | |
| tree | 6ecf27a219ee09f9e9d294d8304df2cb93c4da3d /spec/fixtures/api/schemas/entities/issue_sidebar.json | |
| parent | 48d2c02efe7697914591d7381ce1c72d68eed336 (diff) | |
| download | gitlab-ce-95aae95a1cbb55facd127c74d6c044b13533f3fe.tar.gz | |
Code style changes and refactor
Diffstat (limited to 'spec/fixtures/api/schemas/entities/issue_sidebar.json')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/issue_sidebar.json | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/spec/fixtures/api/schemas/entities/issue_sidebar.json b/spec/fixtures/api/schemas/entities/issue_sidebar.json index ed08df27e0b..93adb493d1b 100644 --- a/spec/fixtures/api/schemas/entities/issue_sidebar.json +++ b/spec/fixtures/api/schemas/entities/issue_sidebar.json @@ -10,15 +10,16 @@ "confidential": { "type": "boolean" }, "reference": { "type": "string" }, "current_user": { - "oneOf": [ - { "type": "null" }, - { "$ref": "user.json" } - ] - }, - "todo": { - "oneOf": [ - { "type": "null" }, - { "$ref": "issuable_sidebar_todo.json" } + "allOf": [ + { "$ref": "../public_api/v4/user/basic.json" }, + { "type": "object", + "properties" : { + "todo": { "$ref": "issuable_sidebar_todo.json" }, + "can_edit": { "type": "boolean" }, + "can_move": { "type": "boolean" }, + "can_admin_label": { "type": "boolean" } + } + } ] }, "milestone": { @@ -31,10 +32,6 @@ "type": "array", "items": { "$ref": "label.json" } }, - "signed_in": { "type": "boolean" }, - "can_edit": { "type": "boolean" }, - "can_move": { "type": "boolean" }, - "can_admin_label": { "type": "boolean" }, "issuable_json_path": { "type": "string" }, "namespace_path": { "type": "string" }, "project_path": { "type": "string" }, |