From 5fd3ec1cfcc7e3109a76c905c1918602eeb4b65c Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Wed, 20 Sep 2017 13:42:41 +0300
Subject: [PATCH] Fix entities/merge_request.json by adding ff_only_merge

---
 spec/fixtures/api/schemas/entities/merge_request.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
 }