Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2019-07-22 16:35:00 +0300
committerYorick Peterse <yorickpeterse@gmail.com>2019-07-22 16:35:00 +0300
commit7e2e48cf6e02cf9bfa12d0ddfcc7a946ddf9d818 (patch)
tree331b5f52e2a269bccd90cea398c4c1283bc35f60 /spec/lib
parent5ca1899a5f436cd1a8d0f6938fa1c22c1fd3d1a3 (diff)
Backport project.json fixture from EE
This backports all changes made to an import/export fixture file from EE to CE.
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/import_export/project.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/lib/gitlab/import_export/project.json b/spec/lib/gitlab/import_export/project.json
index c0b97486eeb..9e54ca28e58 100644
--- a/spec/lib/gitlab/import_export/project.json
+++ b/spec/lib/gitlab/import_export/project.json
@@ -2775,7 +2775,8 @@
"action": 1,
"author_id": 1
}
- ]
+ ],
+ "approvals_before_merge": 1
},
{
"id": 26,