Extract EE specific files/lines for merge request feature tests
We have the following files containing EE specific code. We should move them to ee/
spec/fixtures/api/schemas/public_api/v4/merge_requests.json
diff --git a/spec/fixtures/api/schemas/public_api/v4/merge_requests.json b/home/yorickpeterse/Projects/gitlab/gdk-ee/gitlab/spec/fixtures/api/schemas/public_api/v4/merge_requests.json
index 6df27bf32b9..261c81e9728 100644
--- a/spec/fixtures/api/schemas/public_api/v4/merge_requests.json
+++ b/home/yorickpeterse/Projects/gitlab/gdk-ee/gitlab/spec/fixtures/api/schemas/public_api/v4/merge_requests.json
@@ -101,6 +101,7 @@
"force_remove_source_branch": { "type": ["boolean", "null"] },
"discussion_locked": { "type": ["boolean", "null"] },
"web_url": { "type": "uri" },
+ "approvals_before_merge": { "type": ["integer", "null"] },
"squash": { "type": "boolean" },
"time_stats": {
"time_estimate": { "type": "integer" },
@@ -119,7 +120,7 @@
"labels", "work_in_progress", "milestone", "merge_when_pipeline_succeeds",
"merge_status", "sha", "merge_commit_sha", "user_notes_count",
"should_remove_source_branch", "force_remove_source_branch",
- "web_url", "squash"
+ "web_url", "approvals_before_merge", "squash"
],
"additionalProperties": false
}
Edited by Yorick Peterse