diff options
| author | Brett Walker <bwalker@gitlab.com> | 2019-01-25 09:41:40 -0600 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-01-30 23:18:19 +0100 |
| commit | 2dc304855b7c58fda1773be9774b5d916aa0fe73 (patch) | |
| tree | 2c7ca0a3308f9e80b1084c3074379e1f5e0ae484 | |
| parent | 549821a59f06d8840a6c2d7c500e8d193f6102e1 (diff) | |
| download | gitlab-ce-2dc304855b7c58fda1773be9774b5d916aa0fe73.tar.gz | |
Fix for broken spec
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_basic.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request_basic.json b/spec/fixtures/api/schemas/entities/merge_request_basic.json index 4c04c838cb8..3006b482d41 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_basic.json +++ b/spec/fixtures/api/schemas/entities/merge_request_basic.json @@ -22,7 +22,8 @@ "type": [ "array", "null" ] }, "task_status": { "type": "string" }, - "task_status_short": { "type": "string" } + "task_status_short": { "type": "string" }, + "lock_version": { "type": ["string", "null"] } }, "additionalProperties": false } |