From e2ee1eec50aa8df8543d7ecc585ec0ba5ee544ac Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 8 Apr 2020 03:09:31 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../lib/gitlab/import_export/complex/tree.tar.gz | Bin 0 -> 32595 bytes .../lib/gitlab/import_export/group/tree.tar.gz | Bin 0 -> 1246 bytes .../gitlab/import_export/invalid_json/tree.tar.gz | Bin 0 -> 191 bytes .../lib/gitlab/import_export/light/project.json | 20 +++++++++++++++++++- .../lib/gitlab/import_export/light/tree.tar.gz | Bin 0 -> 1435 bytes .../gitlab/import_export/milestone-iid/tree.tar.gz | Bin 0 -> 714 bytes .../multi_pipeline_ref_one_external_pr/tree.tar.gz | Bin 0 -> 1172 bytes .../import_export/with_invalid_records/tree.tar.gz | Bin 0 -> 513 bytes 8 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 spec/fixtures/lib/gitlab/import_export/complex/tree.tar.gz create mode 100644 spec/fixtures/lib/gitlab/import_export/group/tree.tar.gz create mode 100644 spec/fixtures/lib/gitlab/import_export/invalid_json/tree.tar.gz create mode 100644 spec/fixtures/lib/gitlab/import_export/light/tree.tar.gz create mode 100644 spec/fixtures/lib/gitlab/import_export/milestone-iid/tree.tar.gz create mode 100644 spec/fixtures/lib/gitlab/import_export/multi_pipeline_ref_one_external_pr/tree.tar.gz create mode 100644 spec/fixtures/lib/gitlab/import_export/with_invalid_records/tree.tar.gz (limited to 'spec/fixtures/lib') diff --git a/spec/fixtures/lib/gitlab/import_export/complex/tree.tar.gz b/spec/fixtures/lib/gitlab/import_export/complex/tree.tar.gz new file mode 100644 index 00000000000..feb1a70a89e Binary files /dev/null and b/spec/fixtures/lib/gitlab/import_export/complex/tree.tar.gz differ diff --git a/spec/fixtures/lib/gitlab/import_export/group/tree.tar.gz b/spec/fixtures/lib/gitlab/import_export/group/tree.tar.gz new file mode 100644 index 00000000000..0788ca18fb3 Binary files /dev/null and b/spec/fixtures/lib/gitlab/import_export/group/tree.tar.gz differ diff --git a/spec/fixtures/lib/gitlab/import_export/invalid_json/tree.tar.gz b/spec/fixtures/lib/gitlab/import_export/invalid_json/tree.tar.gz new file mode 100644 index 00000000000..6524ed5042c Binary files /dev/null and b/spec/fixtures/lib/gitlab/import_export/invalid_json/tree.tar.gz differ diff --git a/spec/fixtures/lib/gitlab/import_export/light/project.json b/spec/fixtures/lib/gitlab/import_export/light/project.json index eaed8565a18..326a2cef9ff 100644 --- a/spec/fixtures/lib/gitlab/import_export/light/project.json +++ b/spec/fixtures/lib/gitlab/import_export/light/project.json @@ -186,5 +186,23 @@ } ], "snippets": [], - "hooks": [] + "hooks": [], + "custom_attributes": [ + { + "id": 201, + "project_id": 5, + "created_at": "2016-06-14T15:01:51.315Z", + "updated_at": "2016-06-14T15:01:51.315Z", + "key": "color", + "value": "red" + }, + { + "id": 202, + "project_id": 5, + "created_at": "2016-06-14T15:01:51.315Z", + "updated_at": "2016-06-14T15:01:51.315Z", + "key": "size", + "value": "small" + } + ] } diff --git a/spec/fixtures/lib/gitlab/import_export/light/tree.tar.gz b/spec/fixtures/lib/gitlab/import_export/light/tree.tar.gz new file mode 100644 index 00000000000..eac19c23b44 Binary files /dev/null and b/spec/fixtures/lib/gitlab/import_export/light/tree.tar.gz differ diff --git a/spec/fixtures/lib/gitlab/import_export/milestone-iid/tree.tar.gz b/spec/fixtures/lib/gitlab/import_export/milestone-iid/tree.tar.gz new file mode 100644 index 00000000000..726afa0bfa4 Binary files /dev/null and b/spec/fixtures/lib/gitlab/import_export/milestone-iid/tree.tar.gz differ diff --git a/spec/fixtures/lib/gitlab/import_export/multi_pipeline_ref_one_external_pr/tree.tar.gz b/spec/fixtures/lib/gitlab/import_export/multi_pipeline_ref_one_external_pr/tree.tar.gz new file mode 100644 index 00000000000..13f3d3c6791 Binary files /dev/null and b/spec/fixtures/lib/gitlab/import_export/multi_pipeline_ref_one_external_pr/tree.tar.gz differ diff --git a/spec/fixtures/lib/gitlab/import_export/with_invalid_records/tree.tar.gz b/spec/fixtures/lib/gitlab/import_export/with_invalid_records/tree.tar.gz new file mode 100644 index 00000000000..24c51e72d7d Binary files /dev/null and b/spec/fixtures/lib/gitlab/import_export/with_invalid_records/tree.tar.gz differ -- cgit v1.2.3