diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-07-22 15:35:00 +0200 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-07-22 15:35:00 +0200 |
commit | 7e2e48cf6e02cf9bfa12d0ddfcc7a946ddf9d818 (patch) | |
tree | 331b5f52e2a269bccd90cea398c4c1283bc35f60 | |
parent | 5ca1899a5f436cd1a8d0f6938fa1c22c1fd3d1a3 (diff) | |
download | gitlab-ce-7e2e48cf6e02cf9bfa12d0ddfcc7a946ddf9d818.tar.gz |
Backport project.json fixture from EE
This backports all changes made to an import/export fixture file from EE
to CE.
-rw-r--r-- | spec/lib/gitlab/import_export/project.json | 3 |
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, |