Fix entities/merge_request.json by adding ff_only_merge

5fd3ec1c · Valery Sizov · 19a62632 · 5fd3ec1c
Commit 5fd3ec1c authored Sep 20, 2017 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

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