diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-02-04 11:52:22 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-02-04 11:52:22 +0300 |
| commit | 70b92fb380659717e2f3a4f5aac802ec5460e78c (patch) | |
| tree | f7e8132f13cdcb25b098924e92eff5d53022483d /spec/fixtures | |
| parent | 200ebab1cf8a41585c94a15bcc37547abd73bc80 (diff) | |
| parent | 863ee930a6260c42d3d0252a0310ac9adff24862 (diff) | |
Merge branch '19745-forms-with-task-lists-can-be-overwritten-when-editing-simultaneously' into 'master'
Forms with task lists can be overwritten when editing simultaneously
See merge request gitlab-org/gitlab-ce!23938
Diffstat (limited to 'spec/fixtures')
| -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 } |