Fix for broken spec

2dc30485 · Brett Walker · Fatih Acet · 549821a5 · 2dc30485
Commit 2dc30485 authored Jan 25, 2019 by Brett Walker Committed by Fatih Acet Jan 30, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

spec/fixtures/api/schemas/entities/merge_request_basic.json spec/fixtures/api/schemas/entities/merge_request_basic.json +2 -1

No files found.
--- 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
 }