summaryrefslogtreecommitdiff
path: root/spec/fixtures
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-03 00:08:11 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-03 00:08:11 +0000
commitbd8fb5668ae739a83d55ec5ca4a04344eef2167e (patch)
treebaf085c6cd58b3b5e5a192d4d3db360d623bb056 /spec/fixtures
parent561e1b470f0a99fe6304c8f197348c47a637d594 (diff)
downloadgitlab-ce-bd8fb5668ae739a83d55ec5ca4a04344eef2167e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/lib/gitlab/import_export/complex/project.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/fixtures/lib/gitlab/import_export/complex/project.json b/spec/fixtures/lib/gitlab/import_export/complex/project.json
index 4d6211a1251..fae02540868 100644
--- a/spec/fixtures/lib/gitlab/import_export/complex/project.json
+++ b/spec/fixtures/lib/gitlab/import_export/complex/project.json
@@ -6318,7 +6318,7 @@
]
}
],
- "pipelines": [
+ "ci_pipelines": [
{
"id": 36,
"project_id": 5,