diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 03:09:31 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 03:09:31 +0000 |
commit | e2ee1eec50aa8df8543d7ecc585ec0ba5ee544ac (patch) | |
tree | 7998650d27ada12ee7d06a21cbb3b5e89f298378 /spec/fixtures | |
parent | 060c842402c00f830a810702600cbe39dfa6cf62 (diff) | |
download | gitlab-ce-e2ee1eec50aa8df8543d7ecc585ec0ba5ee544ac.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/tree.tar.gz | bin | 0 -> 32595 bytes | |||
-rw-r--r-- | spec/fixtures/lib/gitlab/import_export/group/tree.tar.gz | bin | 0 -> 1246 bytes | |||
-rw-r--r-- | spec/fixtures/lib/gitlab/import_export/invalid_json/tree.tar.gz | bin | 0 -> 191 bytes | |||
-rw-r--r-- | spec/fixtures/lib/gitlab/import_export/light/project.json | 20 | ||||
-rw-r--r-- | spec/fixtures/lib/gitlab/import_export/light/tree.tar.gz | bin | 0 -> 1435 bytes | |||
-rw-r--r-- | spec/fixtures/lib/gitlab/import_export/milestone-iid/tree.tar.gz | bin | 0 -> 714 bytes | |||
-rw-r--r-- | spec/fixtures/lib/gitlab/import_export/multi_pipeline_ref_one_external_pr/tree.tar.gz | bin | 0 -> 1172 bytes | |||
-rw-r--r-- | spec/fixtures/lib/gitlab/import_export/with_invalid_records/tree.tar.gz | bin | 0 -> 513 bytes |
8 files changed, 19 insertions, 1 deletions
diff --git a/spec/fixtures/lib/gitlab/import_export/complex/tree.tar.gz b/spec/fixtures/lib/gitlab/import_export/complex/tree.tar.gz Binary files differnew file mode 100644 index 00000000000..feb1a70a89e --- /dev/null +++ b/spec/fixtures/lib/gitlab/import_export/complex/tree.tar.gz diff --git a/spec/fixtures/lib/gitlab/import_export/group/tree.tar.gz b/spec/fixtures/lib/gitlab/import_export/group/tree.tar.gz Binary files differnew file mode 100644 index 00000000000..0788ca18fb3 --- /dev/null +++ b/spec/fixtures/lib/gitlab/import_export/group/tree.tar.gz 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 Binary files differnew file mode 100644 index 00000000000..6524ed5042c --- /dev/null +++ b/spec/fixtures/lib/gitlab/import_export/invalid_json/tree.tar.gz 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 Binary files differnew file mode 100644 index 00000000000..eac19c23b44 --- /dev/null +++ b/spec/fixtures/lib/gitlab/import_export/light/tree.tar.gz 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 Binary files differnew file mode 100644 index 00000000000..726afa0bfa4 --- /dev/null +++ b/spec/fixtures/lib/gitlab/import_export/milestone-iid/tree.tar.gz 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 Binary files differnew file mode 100644 index 00000000000..13f3d3c6791 --- /dev/null +++ b/spec/fixtures/lib/gitlab/import_export/multi_pipeline_ref_one_external_pr/tree.tar.gz 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 Binary files differnew file mode 100644 index 00000000000..24c51e72d7d --- /dev/null +++ b/spec/fixtures/lib/gitlab/import_export/with_invalid_records/tree.tar.gz |