diff options
| author | Valery Sizov <valery@gitlab.com> | 2017-09-20 13:42:41 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2017-09-20 13:42:41 +0300 |
| commit | 5fd3ec1cfcc7e3109a76c905c1918602eeb4b65c (patch) | |
| tree | 6dbd3c072a7fc53d42bbd945e4cc8aada9bf539d /spec/fixtures | |
| parent | 19a62632f7cc2130d999778b4de85fe1d52fcffa (diff) | |
| download | gitlab-ce-5fd3ec1cfcc7e3109a76c905c1918602eeb4b65c.tar.gz | |
Fix entities/merge_request.json by adding ff_only_merge
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request.json b/spec/fixtures/api/schemas/entities/merge_request.json index 1030f323a1f..3bae98467a7 100644 --- a/spec/fixtures/api/schemas/entities/merge_request.json +++ b/spec/fixtures/api/schemas/entities/merge_request.json @@ -96,7 +96,8 @@ "remove_wip_path": { "type": "string" }, "commits_count": { "type": "integer" }, "remove_source_branch": { "type": ["boolean", "null"] }, - "merge_ongoing": { "type": "boolean" } + "merge_ongoing": { "type": "boolean" }, + "ff_only_enabled": { "type": ["boolean", false] } }, "additionalProperties": false } |